OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 19:59:20
Branch: HEAD Handle: 2007122218591900
Modified files:
openpkg-src/emacs emacs.patch emacs.spec
Log:
use original giflib instead of libungif (which nowadays is no longer
required because LZW patent expired)
Summary:
Revision Changes Path
1.10 +36 -6 openpkg-src/emacs/emacs.patch
1.64 +1 -1 openpkg-src/emacs/emacs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 emacs.patch
--- openpkg-src/emacs/emacs.patch 7 Jun 2007 08:41:45 -0000 1.9
+++ openpkg-src/emacs/emacs.patch 22 Dec 2007 18:59:19 -0000 1.10
@@ -1,6 +1,27 @@
+Index: configure
+--- configure.orig 2007-05-25 14:43:29 +0200
++++ configure 2007-12-22 19:56:59 +0100
+@@ -13862,7 +13862,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lungif $LIBS"
++LIBS="-lgif $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23103,7 +23103,7 @@
+ echo " Does Emacs use -lXpm? ${HAVE_XPM}"
+ echo " Does Emacs use -ljpeg?
${HAVE_JPEG}"
+ echo " Does Emacs use -ltiff?
${HAVE_TIFF}"
+-echo " Does Emacs use -lungif? ${HAVE_GIF}"
++echo " Does Emacs use -lgif? ${HAVE_GIF}"
+ echo " Does Emacs use -lpng? ${HAVE_PNG}"
+ echo " Does Emacs use X toolkit scroll bars?
${USE_TOOLKIT_SCROLL_BARS}"
+ echo
Index: src/Makefile.in
--- src/Makefile.in.orig 2007-03-21 15:31:24 +0100
-+++ src/Makefile.in 2007-06-07 10:27:37 +0200
++++ src/Makefile.in 2007-12-22 19:57:29 +0100
@@ -158,8 +158,12 @@
/* This holds special options for linking temacs
that should be used for linking anything else. */
@@ -14,9 +35,18 @@
/* Some s/SYSTEM.h files define this to request special switches
for compiling temacs. */
+@@ -440,7 +444,7 @@
+
+ #if HAVE_GIF
+ #ifndef LIBGIF
+-#define LIBGIF -lungif
++#define LIBGIF -lgif
+ #endif /* not defined LIBGIF */
+ #else /* not HAVE_GIF */
+ #define LIBGIF
Index: src/alloc.c
--- src/alloc.c.orig 2007-04-16 07:59:37 +0200
-+++ src/alloc.c 2007-06-07 10:28:36 +0200
++++ src/alloc.c 2007-12-22 19:56:59 +0100
@@ -4566,8 +4566,12 @@
needed on ia64 too. See mach_dep.c, where it also says inline
assembler doesn't work with relevant proprietary compilers. */
@@ -32,7 +62,7 @@
registers used to hold register variables and registers used to
Index: src/m/sparc.h
--- src/m/sparc.h.orig 2007-01-14 04:10:22 +0100
-+++ src/m/sparc.h 2007-06-07 10:27:37 +0200
++++ src/m/sparc.h 2007-12-22 19:56:59 +0100
@@ -76,7 +76,7 @@
#define PURESIZE 130000
#endif
@@ -44,7 +74,7 @@
/* Say that the text segment of a.out includes the header;
Index: src/s/sol2-4.h
--- src/s/sol2-4.h.orig 2003-09-01 17:45:58 +0200
-+++ src/s/sol2-4.h 2007-06-07 10:27:37 +0200
++++ src/s/sol2-4.h 2007-12-22 19:56:59 +0100
@@ -24,7 +24,7 @@
/* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
has anything in it. It can be empty.
@@ -55,8 +85,8 @@
`NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
#endif /* GCC */
Index: src/s/sol2-8.h
---- /dev/null 2007-06-07 10:27:45 +0200
-+++ src/s/sol2-8.h 2007-06-07 10:27:37 +0200
+--- /dev/null 2007-12-22 19:57:00 +0100
++++ src/s/sol2-8.h 2007-12-22 19:56:59 +0100
@@ -0,0 +1,10 @@
+/* Handle Solaris 2.8 and 2.9 */
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.63 -r1.64 emacs.spec
--- openpkg-src/emacs/emacs.spec 7 Jun 2007 08:41:46 -0000 1.63
+++ openpkg-src/emacs/emacs.spec 22 Dec 2007 18:59:19 -0000 1.64
@@ -38,7 +38,7 @@
Group: Editor
License: GPL
Version: %{V_emacs}
-Release: 20070607
+Release: 20071222
# package options
%option with_x11 no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
