Commit graph

95 commits

Author SHA1 Message Date
Jason Samsa 77804abdd4 emacsMacport: add version attribute
Changes in https://github.com/NixOS/nixpkgs/pull/74936 depend on emacs
derivations to have a version attribute.
2019-12-13 14:50:49 -06:00
worldofpeace eda1ea51cd emacs25: support webkitgtk 2019-12-05 16:39:44 -05:00
Mario Rodas bc8ef6c3ff
emacs: also allow librsvg dependency when using withNS 2019-11-05 21:00:00 -05:00
Matthew Bauer abd1172a6f emacs: 26.2 -> 26.3; emacs-mac: 26.2-7.6 -> 26.3-7.7 2019-08-29 10:19:55 -04:00
Matthew Bauer 2255f29206
Merge pull request #64901 from dgchurchill/emacs-imagemagick-macos
emacs: Also allow imagemagick dependency when using withNS
2019-07-17 10:07:01 -04:00
Dave Churchill 9339970dbf emacs: Also allow imagemagick dependency when using withNS
This allows Emacs to be used with imagemagick on macOS.
2019-07-16 22:09:43 +10:00
Frederik Rietdijk 79a03641d5 Merge staging-next into staging 2019-07-09 15:46:26 +02:00
Alex Branham b86c2c54e5
emacs: Silence compiler warnings in site-start.el 2019-07-07 08:35:10 -05:00
Daiderd Jordan f2d2381838
emacs: remove cf-private 2019-07-03 22:20:19 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Frederik Rietdijk f137783927 Merge master into staging-next 2019-05-01 11:45:46 +02:00
Peter Hoeg 496f930948 emacs: do not capture build environment details for a (more) reproducible build 2019-04-29 14:38:04 +08:00
Matthew Bauer ba957d538d emacs-mac: remove MAC_OS_X_VERSION_MAX_ALLOWED
No longer needed
2019-04-26 21:54:58 -04:00
Matthew Bauer f7776ce336 emacs-mac: 26.1 -> 26.2 2019-04-16 15:15:03 -04:00
adisbladis abedaef818
emacs: 26.1 -> 26.2 2019-04-13 00:00:03 +01:00
Vladyslav M 60ec578e6a
Merge pull request #57237 from vlaci/pkgs/emacs
emacs: backport hunspell 1.7.0 support from upstream
2019-03-29 16:32:07 +02:00
Andrew Childs 26e82e684c emacs: only use patchelf on linux
This prevents building Emacs with X on Darwin.

Broken by 5af6e9f75e (#54916)
2019-03-28 16:03:46 +09:00
László Vaskó 4952378a87 emacs: backport hunspell 1.7.0 support from upstream
NixOS 19.03 has hunspell 1.7.0 which is incompatible with emacs 26.1.
This issue has been fixed in upstream and we should drop this patch
after emacs is updated too.
2019-03-10 15:39:29 +01:00
deliciouslytyped e5442ee185 emacs26: adds parameter siteStart: don't hard-code ./site-start.el 2019-03-03 20:25:00 +01:00
Florian Friesdorf fbef5ab82f Remove myself as maintainer from packages
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Matthew Bauer d6d5795ed9
Merge pull request #54916 from pbogdan/emacs-xcursor
emacs: link libXcursor when using lucid toolkit
2019-02-19 22:50:30 -05:00
Daiderd Jordan b8a3084eaa
emacsMacport: fix sandbox build 2019-02-13 19:49:17 +01:00
Piotr Bogdan 5af6e9f75e emacs: link libXcursor when using lucid toolkit 2019-01-30 16:21:06 +00:00
Olli Helenius 2f9b85855b emacs: tramp: detect wrapped gvfsd-fuse daemon
Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable
gvfs-based. Its `tramp-compat-process-running-p` function uses
`/proc/<pid>/comm` to check for the name of running process(es). In Nix, the
gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in
`comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which
means the process is not detected and `tramp-gvfs-enabled` ends up with
`nil` even when gvfs is available.

This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when
determining the value of `tramp-gvfs-enabled`.
2019-01-10 18:16:03 +02:00
Matthew Bauer 7a2f45fe1a emacs-mac: 7.2 → 7.4 2018-12-25 15:24:03 -06:00
Alex Branham c08ec87fe3
Emacs site-start: Use correct feature name
* pkgs/applications/editors/emacs/site-start.el (tramp-sh): Use
  correct feature name

Tramp upstream recently dropped the autoload cookie from
tramp-remote-path. This makes Emacs error when trying to load tramp.
Using the correct feature name fixes this.
2018-12-17 12:36:40 -06:00
c0bw3b 0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Daiderd Jordan c60816c523
emacsMacport: add cf-private
Also remove incorrect emacs25Macport alias.

    Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _mac_term_init in macterm.o
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetDistributedCenter", referenced from:
          _mac_term_init in macterm.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFURLCopyResourcePropertyForKey", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLCreateBookmarkDataFromFile", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLCreateByResolvingBookmarkData", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLResourceIsReachable", referenced from:
          _mac_update_title_bar in macfns.o
          _mac_input_source_properties in macfns.o
      "_NSDefaultRunLoopMode", referenced from:
          -[NSApplication(Emacs) runTemporarilyWithBlock:] in macappkit.o
          ___57-[EmacsController handleQueuedNSEventsWithHoldingQuitIn:]_block_invoke in macappkit.o
          _mac_run_loop_run_once in macappkit.o
          ___mac_run_loop_run_once_block_invoke in macappkit.o
          ___37-[EmacsController(Menu) trackMenuBar]_block_invoke in macappkit.o
          ___create_and_show_dialog_block_invoke.2445 in macappkit.o
          ___mac_select_block_invoke in macappkit.o
          ...
      "_NSURLAttributeModificationDateKey", referenced from:
          _mac_document_create_with_url in macappkit.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSData", referenced from:
          l_OBJC_$_CATEGORY_NSData_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMethodSignature", referenced from:
          l_OBJC_$_CATEGORY_NSMethodSignature_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          l_OBJC_$_CATEGORY_NSMutableArray_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableData", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSNull", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSSet", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table81 in macappkit.o
          GCC_except_table810 in macappkit.o
      "_kCFURLIsAliasFileKey", referenced from:
          _Fmac_file_alias_p in mac.o
      "_kCFURLIsSymbolicLinkKey", referenced from:
          _Fmac_file_alias_p in mac.o
    ld: symbol(s) not found for architecture x86_64
2018-11-07 23:47:19 +01:00
Daiderd Jordan b378760b08
emacs25: add cf-private on darwin and don't propagate frameworks
Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_NSDefaultRunLoopMode", referenced from:
          _ns_send_appdefined in nsterm.o
          -[EmacsApp run] in nsterm.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in nsimage.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macfont.o
      "_OBJC_CLASS_$_NSLocale", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table8 in nsterm.o
          GCC_except_table1 in nsselect.o
    ld: symbol(s) not found for architecture x86_64
2018-11-07 19:18:17 +01:00
Daiderd Jordan f495707eb6 emacs: include cf-private on darwin and don't propagate frameworks
Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_NSDefaultRunLoopMode", referenced from:
          _ns_send_appdefined in nsterm.o
          -[EmacsApp run] in nsterm.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in nsimage.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macfont.o
      "_OBJC_CLASS_$_NSLocale", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table8 in nsterm.o
          GCC_except_table1 in nsselect.o
    ld: symbol(s) not found for architecture x86_64
2018-11-05 21:16:58 +01:00
Matthew Bauer 962756e818 emacs-mac: use generic builder
this builder leads to confusion, especially since it is no longer used
in the normal emacs derivation.
2018-10-14 22:41:42 -05:00
Matthew Bauer 2240445067 emacsMacport: 7.1 → 7.2
Fixes a critical issue with macOS

[NEWS](https://bitbucket.org/mituharu/emacs-mac/raw/master/NEWS-mac)

* emacs-26.1-mac-7.2 (2018-09-09)

** Fixed bugs

*** Buffer contents are not displayed on macOS 10.14.
This is mainly because now NSViews are backed by Core Animation Layer
(layer-backed) by default and non-deferred drawing into views no
longer works.  Instead of switching to deferred drawing (i.e., draw
only inside -[NSView drawRect:]), we draw into our own backing bitmap
in a non-deferred way as before, and update the view contents with the
resulting image via -[NSView updateLayer].  This "application-side
double buffering" is also available on OS X 10.8 - macOS 10.13 if you
set the frame parameter `inhibit-double-buffering' to nil when
creating a frame.  Just like on macOS 10.14, such a frame does not do
LCD smoothing.

*** Screenshot grabbed via Services is displayed in wrong size when we
have display mirroring between Retina and non-Retina displays.

*** Cursor movement just after frame resize sometimes leaves garbage.

*** Crash by the Fall_threads call from the GUI thread at the select
emulation when there are multiple Lisp threads.

*** Info title has ASCII underline unlike other window systems.

*** Vertical scroll bar is created as horizontal if frame font height
is short.

** Improvements

*** macOS 10.14 adds property :appearance to (mac-application-state).
The value may be "NSAppearanceNameAqua" or "NSAppearanceNameDarkAqua".

*** Add new color format "mac:COLOR-LIST-NAME:COLOR-NAME" and
"mac:COLOR-NAME" (shorthand for "mac:System:COLOR-NAME").  The actual
color may be different depending on the global appearance setting on
macOS 10.14.  For example, "mac:textColor" is black on the Light Mode
but is white on the Dark Mode.

*** Default frame colors respect appearance setting on macOS 10.14.
Now the default frame foreground/background color is
"mac:textColor"/"mac:textBackgroundColor", respectively.  Changes of
the system setting of the global appearance are dynamically reflected.

*** New function `mac-color-list-alist' to get the available
combinations of COLOR-LIST-NAMEs and COLOR-NAMEs.  Note that this
value is dependent on user environment and OS version.  Also, some
combinations may represent image patterns rather than colors.  For the
former cases, `(color-values "mac:COLOR-LIST-NAME:COLOR-NAME")'
returns nil.
2018-09-24 21:39:11 -05:00
Andrew Childs bbf37b8c45 emacs: allow X and cli-only builds on Darwin 2018-09-10 12:20:23 +09:00
Herwig Hochleitner ea5bcb78c2 emacs: update dependencies
new config options, xwidgets support updated in emacs 26

cc @chaoflow @lovek323 @peti @the-kenny @jwiegley
2018-08-16 09:38:55 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Justin Bauer ec3957591f
emacs-mac: fix meta
- add myself as a maintainer
- fix name and description for emacs 26
2018-06-20 16:28:25 -04:00
John Wiegley 4821a07370
emacsMacport: 26.1-7.0 -> 26.1-7.1 2018-06-14 15:35:05 -07:00
Matthew Bauer bc490a4b3f emacs-mac: don’t propagate frameworks
This makes the closure really big & is not needed for a running emacs.
2018-06-09 12:58:58 -04:00
Matthew Bauer 697ae2a073 emacsMacport: apply clean-env.patch 2018-06-09 12:33:18 -04:00
Matthew Bauer ee1d6114a8 emacsMacport: 25.3 -> 26.1 2018-05-31 12:34:16 -04:00
Matthew Bauer aa2160e1b6 emacs26: add some tweaks from jwiegley’s overlay
original src:
f85c560bf8/overlays/10-emacs.nix
2018-05-28 13:35:10 -04:00
Matthew Bauer a87b50bc63 emacs: readd version 25 2018-05-28 13:35:05 -04:00
Matthew Bauer ac23a7c459 emacs: 25.3 → 26.1 2018-05-28 11:35:20 -04:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Moritz Ulrich 7cfdb2b1b5
emacs: Search subdirectories of site-lisp in NIX_PROFILES
This adds subdirectories of `share/emacs/site-lisp/` in every path in
`NIX_PROFILES` to `load-path` to allow loading of more complex
libraries like `mu4e`.

Fixes #33412
2018-01-05 10:50:18 +01:00
Moritz Ulrich 1543c8cc01
emacs: Add more documentation to site-start.el
`site-start.el` is the file loaded on startup, containing nix-specific
customizations like adding paths in `NIX_PROFILES` to the
emacs-specific search-path (`load-path`) or making man-pages in these
directories discoverable.
2018-01-05 10:50:13 +01:00
Moritz Drexl 3d52d43dd9 emacs: enable vfork on darwin
Issue described here:
https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html

In particular fixes lagging magit, as described here:
https://magit.vc/manual/magit/MacOS-Performance.html

The .patch file is taken from the reference there.

The fix is in Emacs master, so this patch should be removed when switching to
Emacs 26.1.
2017-12-16 22:25:42 +00:00
Anthony Cowley a4203d0ffc emacsMacport: 25.3-6.7 -> 25.3-6.8 2017-10-16 15:16:01 -04:00
Eelco Dolstra cf599d3f99
emacs: Clear the environment while dumping
This reduces the closure size of Emacs from 575 to 279 MiB. Dumping
Emacs had a chance of leaking parts of the environment (such as $PATH)
into the dumped executable. This hopefully fixes it. (It's a bit hard
to tell since the effect is not deterministic.)
2017-09-25 19:38:44 +02:00
Anthony Cowley 50a33089c6 emacsMacport: emacs-25.2 => 25.3, macport-6.3 => 6.7 2017-09-14 16:22:19 -04:00