From cd1f7e251425c93e5dfe6d9ef89b19aca09e5bb37ee8deefa24a387e26baf1ab Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Fri, 14 Aug 2009 12:58:58 +0000
Subject: [PATCH] Updating link to change in openSUSE:Factory/emacs revision
 36.0

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=b35aa36ecbdf99eef0a4fa8e7cce279b
---
 emacs-23.1-glibc.patch |  8 ++++--
 emacs-23.1.dif         | 65 ++++++++++++++++++++++++++++++++++++++++--
 emacs.changes          |  7 +++++
 emacs.spec             |  5 +++-
 4 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/emacs-23.1-glibc.patch b/emacs-23.1-glibc.patch
index dfe7d52..9dd708d 100644
--- a/emacs-23.1-glibc.patch
+++ b/emacs-23.1-glibc.patch
@@ -64,7 +64,7 @@
  # undef static
 --- src/s/gnu-linux.h
 +++ src/s/gnu-linux.h	2009-08-10 18:12:23.537901415 +0200
-@@ -275,5 +275,13 @@ along with GNU Emacs.  If not, see <http
+@@ -275,5 +275,15 @@ along with GNU Emacs.  If not, see <http
  #endif
  #endif
  
@@ -73,8 +73,10 @@
 +#define GETOPT_IN_LIBC
 +
 +/* Use system malloc from glibc and memory mappging */
-+#define SYSTEM_MALLOC
-+#define USE_MMAP_FOR_BUFFERS
++#if !defined(__ia64__)
++# define SYSTEM_MALLOC
++# define USE_MMAP_FOR_BUFFERS
++#endif
 +
  /* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9
     (do not change this comment) */
diff --git a/emacs-23.1.dif b/emacs-23.1.dif
index 61cf671..942609c 100644
--- a/emacs-23.1.dif
+++ b/emacs-23.1.dif
@@ -166,12 +166,14 @@
      if test -e /usr/lib64/crtn.o; then
        AC_DEFINE(HAVE_LIB64_DIR, 1,
          [Define to 1 if the directory /usr/lib64 exists.])
-@@ -1184,7 +1184,7 @@ fi
+@@ -1183,8 +1183,8 @@ fi
+
  if test "${x_libraries}" != NONE; then
    if test -n "${x_libraries}"; then
-     LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
+-    LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
 -    LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
-+    LD_SWITCH_X_SITE_AUX=-rpath-link`echo " ${x_libraries}" | sed -e "s/:/ -rpath-link /g"`
++    LD_SWITCH_X_SITE="-L ${x_libraries%%:*}"
++    LD_SWITCH_X_SITE_AUX="-rpath-link ${x_libraries%%:*}"
    fi
    x_default_search_path=""
    x_search_path=${x_libraries}
@@ -1026,6 +1028,15 @@
 +;; Ende von locale.el
 --- src/Makefile.in
 +++ src/Makefile.in	2007-05-15 19:19:55.000000000 +0200
+@@ -429,7 +429,7 @@ RSVG_CFLAGS= @RSVG_CFLAGS@
+ /* Fix linking if compiled with GCC.  */
+ #ifdef __GNUC__
+ 
+-#ifdef LINKER
++#if 0 /* def LINKER */
+ #define LINKER_WAS_SPECIFIED
+ #endif
+ 
 @@ -660,6 +660,9 @@ otherobj= $(termcapobj) lastfile.o $(mal
  #define TOOLTIP_SUPPORT
  #endif
@@ -1055,6 +1066,20 @@
  
  /* If we're using X11/Carbon/GNUstep, define some consequences.  */
  #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+--- src/doprnt.c
++++ src/doprnt.c	2009-08-14 12:52:12.053901604 +0200
+@@ -153,8 +153,9 @@ doprnt1 (lispstrings, buffer, bufsize, f
+ 		  unsigned n = *fmt - '0';
+ 		  while ('0' <= fmt[1] && fmt[1] <= '9')
+ 		    {
+-		      if (n * 10 / 10 != n
+-			  || (n = n * 10 + (fmt[1] - '0')) < n)
++		      unsigned m = n * 10;
++		      if (m / 10 != n
++			  || (n = m + (fmt[1] - '0')) < n)
+ 			error ("Format width or precision too large");
+ 		      *string++ = *++fmt;
+ 		    }
 --- src/fns.c
 +++ src/fns.c	2003-07-23 18:08:56.000000000 +0200
 @@ -73,6 +73,10 @@ Lisp_Object Qwidget_type;
@@ -1090,6 +1115,40 @@
  tracking_off (old_value)
       Lisp_Object old_value;
  {
+--- src/lisp.h
++++ src/lisp.h	2009-08-14 13:07:01.113902121 +0200
+@@ -1911,11 +1911,10 @@ extern Lisp_Object case_temp2;
+ 
+ /* Downcase a character, or make no change if that cannot be done.  */
+ 
+-#define DOWNCASE(CH)						\
+-  ((case_temp1 = (CH),						\
+-    case_temp2 = CHAR_TABLE_REF (DOWNCASE_TABLE, case_temp1),	\
+-    NATNUMP (case_temp2))					\
+-   ? XFASTINT (case_temp2) : case_temp1)
++#define DOWNCASE(CH)	(__extension__				\
++  ({case_temp1 = (CH);						\
++    case_temp2 = CHAR_TABLE_REF (DOWNCASE_TABLE, case_temp1);	\
++    (NATNUMP (case_temp2)) ? XFASTINT (case_temp2) : case_temp1; }))
+ 
+ /* 1 if CH is upper case.  */
+ 
+@@ -1935,11 +1934,10 @@ extern Lisp_Object case_temp2;
+ 
+ /* Upcase a character known to be not upper case.  */
+ 
+-#define UPCASE1(CH)						\
+-  ((case_temp1 = (CH),						\
+-    case_temp2 = CHAR_TABLE_REF (UPCASE_TABLE, case_temp1),	\
+-    NATNUMP (case_temp2))					\
+-   ? XFASTINT (case_temp2) : case_temp1)
++#define UPCASE1(CH)	(__extension__				\
++  ({case_temp1 = (CH);						\
++    case_temp2 = CHAR_TABLE_REF (UPCASE_TABLE, case_temp1);	\
++    (NATNUMP (case_temp2)) ? XFASTINT (case_temp2) : case_temp1; }))
+ 
+ extern Lisp_Object Vascii_downcase_table, Vascii_upcase_table;
+ extern Lisp_Object Vascii_canon_table, Vascii_eqv_table;
 --- src/prefix-args.c
 +++ src/prefix-args.c	2009-08-12 15:53:28.073901668 +0200
 @@ -52,6 +52,7 @@ along with GNU Emacs.  If not, see <http
diff --git a/emacs.changes b/emacs.changes
index bd80fe1..ee6ee34 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 14 13:19:59 CEST 2009 - werner@suse.de
+
+- Make ppc, ppc64, and s390x build by forcing -Xlinker
+- Make ia64 build by reducing gcc optimization
+- Remove warning about undefined operations
+
 -------------------------------------------------------------------
 Thu Aug 13 15:33:27 CEST 2009 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 576ab6c..2fa20a0 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -24,7 +24,7 @@ Url:            http://www.gnu.org/software/emacs/
 License:        GPL v2 or later
 Group:          Productivity/Editors/Emacs
 Version:        23.1
-Release:        1
+Release:        2
 Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
@@ -276,6 +276,9 @@ VERSION=%{version}
   cflags -Wno-unprototyped-calls CFLAGS
   cflags -Wl,-O2		 LDFLAGS
   cflags -Wl,--hash-size=65521	 LDFLAGS
+%ifarch ia64
+  CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g')
+%endif
   SMALL="-DSYSTEM_PURESIZE_EXTRA=25000 \
 	 -DSITELOAD_PURESIZE_EXTRA=10000 \
 "