Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory vz-cvs-3.sog:/tmp/cvs-serv6040
Modified Files:
emacs23.info emacs23.patch
Log Message:
new version (thanks snaggle!)
Index: emacs23.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs23.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- emacs23.info 11 Apr 2011 13:22:16 -0000 1.3
+++ emacs23.info 10 Oct 2011 16:42:28 -0000 1.4
@@ -1,8 +1,7 @@
Info2: <<
Package: emacs23%type_pkg[uitype]
-Version: 23.1
-Revision: 201
-Distribution: 10.5, 10.6
+Version: 23.3a
+Revision: 1
Type: uitype (. -nox)
Description: Flexible real-time text editor
License: GPL
@@ -15,17 +14,18 @@
emacsen-common,
libncurses5-shlibs (>= 5.4-20041023-1006),
ncurses (>= 5.4-20041023-1006),
- passwd,
+ passwd-games | passwd,
(%type_raw[uitype] = .) atk1-shlibs (>= 1.28.0-1),
(%type_raw[uitype] = .) cairo-shlibs (>= 1.8.8-3),
(%type_raw[uitype] = .) fontconfig2-shlibs (>= 2.8.0-4),
(%type_raw[uitype] = .) freetype219-shlibs (>= 2.3.12-1),
(%type_raw[uitype] = .) giflib-shlibs,
+ (%type_raw[uitype] = .) gconf2-shlibs (>= 2.28.0-1),
(%type_raw[uitype] = .) glib2-shlibs (>= 2.22.0-1),
(%type_raw[uitype] = .) gtk+2-shlibs (>= 2.18.0-1),
(%type_raw[uitype] = .) libjpeg8-shlibs,
(%type_raw[uitype] = .) libotf-shlibs,
- (%type_raw[uitype] = .) libpng3-shlibs,
+ (%type_raw[uitype] = .) libpng15-shlibs,
(%type_raw[uitype] = .) librsvg2-shlibs (>= 2.26.0-3),
(%type_raw[uitype] = .) libtiff-shlibs,
(%type_raw[uitype] = .) pango1-xft2-ft219 (>= 1.24.5-4),
@@ -40,16 +40,16 @@
pkgconfig (>= 0.23-1),
(%type_raw[uitype] = .) atk1 (>= 1.28.0-1),
(%type_raw[uitype] = .) cairo (>= 1.8.8-3),
- (%type_raw[uitype] = .) expat1,
(%type_raw[uitype] = .) fontconfig2-dev (>= 2.8.0-4),
(%type_raw[uitype] = .) freetype219 (>= 2.3.12-1),
+ (%type_raw[uitype] = .) gconf2-dev (>= 2.28.0-1),
(%type_raw[uitype] = .) giflib,
(%type_raw[uitype] = .) glib2-dev (>= 2.22.0-1),
(%type_raw[uitype] = .) glitz,
(%type_raw[uitype] = .) gtk+2-dev (>= 2.18.0-1),
(%type_raw[uitype] = .) libjpeg8,
(%type_raw[uitype] = .) libotf,
- (%type_raw[uitype] = .) libpng3,
+ (%type_raw[uitype] = .) libpng15,
(%type_raw[uitype] = .) librsvg2 (>= 2.26.0-3),
(%type_raw[uitype] = .) libtiff,
(%type_raw[uitype] = .) pango1-xft2-ft219-dev (>= 1.24.5-4),
@@ -60,29 +60,28 @@
Conflicts: emacs23, emacs23-nox
Replaces: emacs23, emacs23-nox
Source: mirror:gnu:emacs/emacs-%v.tar.gz
-Source-MD5: a620d4452769d04ad8864d662f34f8dd
+Source-MD5: 20aef9ea5b5bf8050d39f8b1e96a1c04
+SourceDirectory: emacs-23.3
PatchFile: emacs23.patch
-PatchFile-MD5: 95ed8daff9fd24ae9c7a70c06594a2bc
+PatchFile-MD5: eba63fe9378d9010a33e0451777ff455
PatchScript: <<
%{default_script}
# see DescPackaging
perl -pi -e 's/(xft >= 0.13.0)/\1 xrender/g' configure
<<
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
# makefiles pass CPPFLAGS early: don't want to override local -I with global
NoSetCPPFLAGS: true
SetCPPFLAGS: -MD
-SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib/xft2/lib
-SetCFLAGS: -Os -pipe
+SetLDFLAGS: -fno-pie -L%p/lib/fontconfig2/lib -L%p/lib/xft2/lib
+SetCFLAGS: -Os -pipe -fno-pie
ConfigureParams: --enable-dependency-tracking --infodir='${prefix}/share/info'
--mandir='${prefix}/share/man' --libexecdir='${prefix}/lib'
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
INSTALL_INFO=/usr/bin/true
CompileScript: <<
#!/bin/bash -ev
if [ "%type_raw[uitype]" == "-nox" ]; then
- ./configure %c --without-x
+ ./configure %c --without-x --without-gconf --without-librsvg
else
- ./configure %c --with-x --with-x-toolkit=gtk
+ ./configure %c --with-x --with-x-toolkit=gtk --with-gconf
fi
# Sync .elc's with patched .el's
(cd src && make bootstrap-emacs) || exit
@@ -112,9 +111,9 @@
mkdir -p %i/etc/emacs
mkdir -p %i/etc/emacs23/site-start.d
mkdir -p %i/share/emacs23
- mv %i/share/emacs/%v/site-lisp %i/share/emacs23/
- (cd %i/share/emacs/%v; ln -s ../../emacs23/site-lisp site-lisp)
- (cd %i/bin; chmod 755 emacs-%v; ln -s emacs-%v emacs23)
+ mv %i/share/emacs/23.3/site-lisp %i/share/emacs23/
+ (cd %i/share/emacs/23.3; ln -s ../../emacs23/site-lisp site-lisp)
+ (cd %i/bin; chmod 755 emacs-23.3; ln -s emacs-23.3 emacs23)
mv %i/share/info %i/share/emacs-23.info
mkdir -p %i/share/info
@@ -123,13 +122,13 @@
chmod 755 fix-info
./fix-info %i/share/info/emacs-23
- chmod 755 %i/share/emacs/%v/leim/ja-dic
- chmod 755 %i/share/emacs/%v/leim/quail
+ chmod 755 %i/share/emacs/23.3/leim/ja-dic
+ chmod 755 %i/share/emacs/23.3/leim/quail
rm %i/share/emacs/site-lisp/subdirs.el
<<
#
PostInstScript: <<
- mkdir -p %p/etc/lisp/emacs/%v/site-lisp
+ mkdir -p %p/etc/lisp/emacs/23.3/site-lisp
mkdir -p %p/etc/lisp/emacs/site-lisp
update-alternatives --install %p/bin/emacs emacs %p/bin/emacs23 50
--slave %p/share/man/man1/emacs.1 emacs.1 %p/share/man/man1/emacs.1.emacs23
update-alternatives --install %p/bin/ctags ctags %p/bin/ctags.emacs23 50
--slave %p/share/man/man1/ctags.1 ctags.1 %p/share/man/man1/ctags.1.emacs23
@@ -142,8 +141,8 @@
# redundant but apparently necessary since doing it in the build script
# isn't actually making the change when the .deb is unpacked (why?)
- chmod 755 %p/share/emacs/%v/leim/ja-dic
- chmod 755 %p/share/emacs/%v/leim/quail
+ #chmod 755 %p/share/emacs/23.3/leim/ja-dic
+ #chmod 755 %p/share/emacs/23.3/leim/quail
# Register ourselves with emacsen-common
%p/lib/emacsen-common/emacs-install emacs23
@@ -162,8 +161,8 @@
# this was removed from lib-src/Makefile so that package passes
# --build-as-nobody
- chown games %p/lib/emacs/%v/*/update-game-score
- chmod u+s %p/lib/emacs/%v/*/update-game-score
+ chown games %p/lib/emacs/23.3/*/update-game-score
+ chmod u+s %p/lib/emacs/23.3/*/update-game-score
chown games %p/var/games/emacs23
chmod u=rwx,g=rwx,o=rx %p/var/games/emacs23
<<
@@ -215,8 +214,6 @@
of xft2 flag detection. --enable-dependency-tracking doesn't seem to
have an effect, so do -MD explicitly. Make sure to get proper
fink-supplied masking of x11-supplied stuff, including buried things.
-
- Uses png_check_sig, which fink's libpng14 doesn't have.
<<
ConfFiles: %p/var/games/emacs23/tetris-scores %p/var/games/emacs23/snake-scores
DescPort: <<
@@ -227,6 +224,10 @@
http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=4122
to fix the Buffers menu. Thanks to Ingo Theis for reporting this and finding
the bug report thread.
+
+src/unexmacosx.c fixes:
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8223
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8395 (-fno-pie)
<<
Homepage: http://www.gnu.org/software/emacs/
<<
Index: emacs23.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs23.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- emacs23.patch 2 Nov 2010 15:46:16 -0000 1.2
+++ emacs23.patch 10 Oct 2011 16:42:28 -0000 1.3
@@ -1,7 +1,7 @@
-diff --exclude='*~' -ruN emacs-23.1/configure emacs-23.1.patched/configure
---- emacs-23.1/configure 2009-07-29 17:12:00.000000000 +0200
-+++ emacs-23.1.patched/configure 2009-08-26 16:55:27.000000000 +0200
-@@ -1854,7 +1854,7 @@
+diff -Nurd -x'*~' emacs-23.3.orig/configure emacs-23.3/configure
+--- emacs-23.3.orig/configure 2011-03-07 00:29:43.000000000 -0500
++++ emacs-23.3/configure 2011-10-10 12:25:38.000000000 -0400
+@@ -2466,7 +2466,7 @@
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
@@ -10,7 +10,7 @@
gameuser=games
-@@ -2489,12 +2489,6 @@
+@@ -3165,12 +3165,6 @@
opsys=darwin
# Define CPP as follows to make autoconf work correctly.
CPP="${CC-cc} -E -no-cpp-precomp"
@@ -23,7 +23,7 @@
;;
## HP 9000 series 700 and 800, running HP/UX
-@@ -10942,7 +10942,7 @@
+@@ -8074,7 +8068,7 @@
HAVE_GTK=no
if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
GLIB_REQUIRED=2.6
@@ -32,21 +32,21 @@
GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
-@@ -14610,9 +14610,9 @@
+@@ -10097,9 +10091,9 @@
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
- echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
--if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
-+#if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_ungif_EGifPutExtensionLast" >&5
+ $as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
+-if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then :
++#if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then :
HAVE_GIF=yes
-fi
+#fi
if test "$HAVE_GIF" = yes; then
-diff --exclude='*~' -ruN emacs-23.1/fix-info emacs-23.1.patched/fix-info
---- emacs-23.1/fix-info 1970-01-01 01:00:00.000000000 +0100
-+++ emacs-23.1.patched/fix-info 2009-08-26 17:44:01.000000000 +0200
+diff -Nurd -x'*~' emacs-23.3.orig/fix-info emacs-23.3/fix-info
+--- emacs-23.3.orig/fix-info 1969-12-31 19:00:00.000000000 -0500
++++ emacs-23.3/fix-info 2011-10-10 12:25:38.000000000 -0400
@@ -0,0 +1,13 @@
+#!/bin/sh
+
@@ -62,12 +62,12 @@
+ ./mangle-info ${THE_INFO_PREFIX}/${file}
+done
\ No newline at end of file
-diff --exclude='*~' -ruN emacs-23.1/lib-src/Makefile.in
emacs-23.1.patched/lib-src/Makefile.in
---- emacs-23.1/lib-src/Makefile.in 2009-06-21 00:37:34.000000000 -0400
-+++ emacs-23.1.patched/lib-src/Makefile.in 2010-07-18 03:29:30.000000000
-0400
-@@ -306,13 +306,6 @@
- $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}
- touch $(DESTDIR)${gamedir}/snake-scores
+diff -Nurd -x'*~' emacs-23.3.orig/lib-src/Makefile.in
emacs-23.3/lib-src/Makefile.in
+--- emacs-23.3.orig/lib-src/Makefile.in 2011-01-08 12:45:14.000000000
-0500
++++ emacs-23.3/lib-src/Makefile.in 2011-10-10 12:25:38.000000000 -0400
+@@ -307,13 +307,6 @@
+ umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}; \
+ touch $(DESTDIR)${gamedir}/snake-scores; \
touch $(DESTDIR)${gamedir}/tetris-scores
-/* If the following commands fail, that is not a big deal.
- update-game-score will detect at runtime that it is not setuid,
@@ -79,9 +79,9 @@
if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
!= `(cd ${srcdir} && /bin/pwd)` ]; then \
for file in ${SCRIPTS}; do \
-diff --exclude='*~' -ruN emacs-23.1/lisp/startup.el
emacs-23.1.patched/lisp/startup.el
---- emacs-23.1/lisp/startup.el 2009-06-21 06:37:46.000000000 +0200
-+++ emacs-23.1.patched/lisp/startup.el 2009-08-26 16:57:34.000000000 +0200
+diff -Nurd -x'*~' emacs-23.3.orig/lisp/startup.el emacs-23.3/lisp/startup.el
+--- emacs-23.3.orig/lisp/startup.el 2011-01-08 12:45:14.000000000 -0500
++++ emacs-23.3/lisp/startup.el 2011-10-10 12:25:38.000000000 -0400
@@ -375,6 +375,10 @@
(defvar normal-top-level-add-subdirs-inode-list nil)
@@ -93,7 +93,7 @@
(defvar no-blinking-cursor nil)
(defvar default-frame-background-mode)
-@@ -977,9 +981,19 @@
+@@ -955,9 +959,19 @@
;; be loaded from site-run-file and wants to test if -q was given
;; should check init-file-user instead, since that is already set.
;; See cus-edit.el for an example.
@@ -116,9 +116,9 @@
;; Sites should not disable this. Only individuals should disable
;; the startup screen.
(setq inhibit-startup-screen nil)
-diff --exclude='*~' -ruN emacs-23.1/mangle-info emacs-23.1.patched/mangle-info
---- emacs-23.1/mangle-info 1970-01-01 01:00:00.000000000 +0100
-+++ emacs-23.1.patched/mangle-info 2009-08-26 16:56:06.000000000 +0200
+diff -Nurd -x'*~' emacs-23.3.orig/mangle-info emacs-23.3/mangle-info
+--- emacs-23.3.orig/mangle-info 1969-12-31 19:00:00.000000000 -0500
++++ emacs-23.3/mangle-info 2011-10-10 12:25:38.000000000 -0400
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -w -i
+
@@ -138,133 +138,26 @@
+print "$1($prefix/$2)";
+print ${POSTMATCH};
+
-diff --exclude='*~' -ruN emacs-23.1/src/Makefile.in
emacs-23.1.patched/src/Makefile.in
---- emacs-23.1/src/Makefile.in 2009-07-01 08:24:14.000000000 -0400
-+++ emacs-23.1.patched/src/Makefile.in 2010-07-21 04:27:48.000000000 -0400
-@@ -253,8 +253,8 @@
+diff -Nurd -x'*~' emacs-23.3.orig/src/Makefile.in emacs-23.3/src/Makefile.in
+--- emacs-23.3.orig/src/Makefile.in 2011-02-19 12:30:55.000000000 -0500
++++ emacs-23.3/src/Makefile.in 2011-10-10 12:25:38.000000000 -0400
+@@ -269,7 +269,7 @@
/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
since it may have -I options that should override those two. */
--ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir}
C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS}
${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@
@M17N_FLT_CFLAGS@
-+ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir}
C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SYSTEM_TEMACS @XFT_CFLAGS@
@FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ ${CFLAGS_SOUND} ${RSVG_CFLAGS}
${DBUS_CFLAGS} ${CFLAGS} @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ C_SWITCH_X_SITE
C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM
+-ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir}
C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS}
${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@
@LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
++ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir}
C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SYSTEM_TEMACS @XFT_CFLAGS@
@FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ ${CFLAGS_SOUND} ${RSVG_CFLAGS}
${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@
C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${DEPFLAGS}
ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
.SUFFIXES: .m
- #endif /* not HAVE_X11 */
---- emacs-23.1/src/unexmacosx.c 2009-09-02 12:46:14.000000000 +0200
-+++ emacs-23.1.patched/src/unexmacosx.c 2009-09-02 12:53:34.000000000
+0200
-@@ -582,6 +582,14 @@
- printf ("LC_UUID ");
- break;
- #endif
-+#ifdef LC_DYLD_INFO
-+ case LC_DYLD_INFO:
-+ printf ("LC_DYLD_INFO ");
-+ break;
-+ case LC_DYLD_INFO_ONLY:
-+ printf ("LC_DYLD_INFO_ONLY");
-+ break;
-+#endif
- default:
- printf ("unknown ");
- }
-@@ -819,6 +827,7 @@
+diff -Nurd -x'*~' emacs-23.3.orig/src/unexmacosx.c emacs-23.3/src/unexmacosx.c
+--- emacs-23.3.orig/src/unexmacosx.c 2011-01-08 12:45:14.000000000 -0500
++++ emacs-23.3/src/unexmacosx.c 2011-10-10 12:25:38.000000000 -0400
+@@ -822,6 +822,7 @@
+ }
+ else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
+ || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
++ || strncmp (sectp->sectname, "__got", 16) == 0
+ || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
+ || strncmp (sectp->sectname, "__dyld", 16) == 0
|| strncmp (sectp->sectname, "__const", 16) == 0
- || strncmp (sectp->sectname, "__cfstring", 16) == 0
- || strncmp (sectp->sectname, "__gcc_except_tab", 16) == 0
-+ || strncmp (sectp->sectname, "__program_vars", 16) == 0
- || strncmp (sectp->sectname, "__objc_", 7) == 0)
- {
- if (!unexec_copy (sectp->offset, old_file_offset, sectp->size))
-@@ -1086,6 +1095,36 @@
- curr_header_offset += lc->cmdsize;
- }
-
-+#ifdef LC_DYLD_INFO
-+/* Copy a LC_DYLD_INFO(_ONLY) load command from the input file to the output
-+ file, adjusting the file offset fields. */
-+static void
-+copy_dyld_info (struct load_command *lc, long delta)
-+{
-+ struct dyld_info_command *dip = (struct dyld_info_command *) lc;
-+
-+ if (dip->rebase_off > 0)
-+ dip->rebase_off += delta;
-+ if (dip->bind_off > 0)
-+ dip->bind_off += delta;
-+ if (dip->weak_bind_off > 0)
-+ dip->weak_bind_off += delta;
-+ if (dip->lazy_bind_off > 0)
-+ dip->lazy_bind_off += delta;
-+ if (dip->export_off > 0)
-+ dip->export_off += delta;
-+
-+ printf ("Writing ");
-+ print_load_command_name (lc->cmd);
-+ printf (" command\n");
-+
-+ if (!unexec_write (curr_header_offset, lc, lc->cmdsize))
-+ unexec_error ("cannot write dyld info command to header");
-+
-+ curr_header_offset += lc->cmdsize;
-+}
-+#endif
-+
- /* Copy other kinds of load commands from the input file to the output
- file, ones that do not require adjustments of file offsets. */
- static void
-@@ -1152,6 +1191,12 @@
- case LC_TWOLEVEL_HINTS:
- copy_twolevelhints (lca[i], linkedit_delta);
- break;
-+#ifdef LC_DYLD_INFO
-+ case LC_DYLD_INFO:
-+ case LC_DYLD_INFO_ONLY:
-+ copy_dyld_info (lca[i], linkedit_delta);
-+ break;
-+#endif
- default:
- copy_other (lca[i]);
- break;
---- emacs-23.1/src/s/darwin.h 2009-09-02 12:54:24.000000000 +0200
-+++ emacs-23.1.patched/src/s/darwin.h 2009-09-02 12:56:35.000000000 +0200
-@@ -171,6 +171,9 @@
- #define malloc unexec_malloc
- #define realloc unexec_realloc
- #define free unexec_free
-+/* Don't use posix_memalign because it is not compatible with
-+ unexmacosx.c. */
-+#undef HAVE_POSIX_MEMALIGN
- #endif
-
- /* The ncurses library has been moved out of the System framework in
---- emacs-23.1/src/xfns.c 2009-08-31 00:03:02.000000000 +0100
-+++ emacs-23.1.patched/src/xfns.c 2009-08-31 00:21:39.000000000 +0100
-@@ -468,8 +468,10 @@
- if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
- continue;
- x = f->output_data.x;
-- /* Match if the window is this frame's menubar. */
- #ifdef USE_GTK
-+ /* Match if the window is this frame's window (button presses are no
longer
-+ caught by the menubar) or a menu in the menubar.
-+ */
- if (x->menubar_widget)
- {
- GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
-@@ -477,13 +479,14 @@
-
- BLOCK_INPUT;
- if (gwdesc != 0
-- && (gwdesc == x->menubar_widget
-+ && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent
(x->menubar_widget))
- || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
- found = 1;
- UNBLOCK_INPUT;
- if (found) return f;
- }
- #else
-+ /* Match if the window is in this frame's menubar */
- if (x->menubar_widget
- && lw_window_is_in_menubar (wdesc, x->menubar_widget))
- return f;
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
