rpms/xemacs/F-12 xemacs-21.5.28-courier-default.patch, 1.4, 1.5 xemacs-21.5.29-tty-font-512623.patch, NONE, 1.1 xemacs.spec, 1.53, 1.54
Jerry James
jjames at fedoraproject.org
Thu Oct 29 16:34:33 UTC 2009
Author: jjames
Update of /cvs/pkgs/rpms/xemacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24611/F-12
Modified Files:
xemacs.spec
Added Files:
xemacs-21.5.28-courier-default.patch
xemacs-21.5.29-tty-font-512623.patch
Log Message:
* Wed Oct 28 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-6
- Bring back the courier font patch; that was a red herring.
- Really, seriously fix bz 512623 with a TTY font patch.
- Fix the version number in macros.xemacs.
- Build with bignum support.
- Turn off OSS support.
xemacs-21.5.28-courier-default.patch:
faces.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: xemacs-21.5.28-courier-default.patch
===================================================================
RCS file: xemacs-21.5.28-courier-default.patch
diff -N xemacs-21.5.28-courier-default.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xemacs-21.5.28-courier-default.patch 29 Oct 2009 16:34:31 -0000 1.5
@@ -0,0 +1,11 @@
+--- xemacs-21.5.28/src/faces.c 2009-05-18 14:51:08.000000000 -0000
++++ xemacs-21.5.28/src/faces.c 2009-08-24 17:07:03.000000000 -0000
+@@ -2411,7 +2411,7 @@
+ Fcons
+ (Fcons
+ (list1 (device_symbol),
+- build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
++ build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")),
+ inst_list);
+
+ #endif /* !USE_XFT */
xemacs-21.5.29-tty-font-512623.patch:
objects.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE xemacs-21.5.29-tty-font-512623.patch ---
diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c
--- xemacs-21.5.29.ORIG/src/objects.c 2009-05-18 08:51:09.000000000 -0600
+++ xemacs-21.5.29/src/objects.c 2009-10-29 09:09:21.562935348 -0600
@@ -892,6 +892,11 @@
instantiator = Ffont_instance_name (instantiator);
}
+#ifdef HAVE_TTY
+ if (LISTP (instantiator))
+ instantiator = build_string ("normal");
+#endif
+
if (STRINGP (instantiator))
{
#ifdef MULE
@@ -981,7 +986,11 @@
static void
font_validate (Lisp_Object instantiator)
{
- if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator))
+ if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)
+#ifdef HAVE_TTY
+ || LISTP (instantiator)
+#endif
+ )
return;
if (VECTORP (instantiator))
{
Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xemacs.spec 24 Sep 2009 14:13:39 -0000 1.53
+++ xemacs.spec 29 Oct 2009 16:34:31 -0000 1.54
@@ -18,10 +18,11 @@
%endif
#global snap 20090311hg4626
+%global majver 21.5
Name: xemacs
Version: 21.5.29
-Release: 5%{?snap:.%{snap}}%{?dist}
+Release: 6%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
@@ -30,7 +31,7 @@ URL: http://www.xemacs.org/
%if 0%{?snap:1}
Source0: %{name}-%{snap}.tar.lzma
%else
-Source0: http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
+Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz
%endif
Source1: %{name}.png
Source2: xemacs.desktop
@@ -49,7 +50,10 @@ Patch5: %{name}-21.5.25-wnnfix-1
Patch6: %{name}-21.5.29-no-xft.patch
# Applied upstream 2009-09-23
Patch7: %{name}-21.5.29-png.patch
+Patch8: %{name}-21.5.28-courier-default.patch
Patch9: %{name}-21.5.29-destdir.patch
+# Sent upstream 2009-10-28
+Patch10: %{name}-21.5.29-tty-font-512623.patch
# Sent upstream 2009-03-12
Patch14: %{name}-beta-infodir.patch
@@ -80,6 +84,7 @@ BuildRequires: xmkmf
BuildRequires: libXau-devel
BuildRequires: libXpm-devel
BuildRequires: alsa-lib-devel
+BuildRequires: gmp-devel
%if %{with gtk}
BuildRequires: gtk+-devel
BuildRequires: libglade-devel
@@ -154,6 +159,9 @@ This package contains XEmacs built witho
Summary: Emacs lisp source files for XEmacs
Group: Development/Libraries
Requires: %{name}-common = %{version}-%{release}
+%if 0%{?fedora} >= 10
+BuildArch: noarch
+%endif
%description el
XEmacs is a highly customizable open source text editor and
@@ -218,7 +226,9 @@ touch -r aclocal.m4-stamp aclocal.m4
%patch6 -p1
%endif
%patch7 -p1
+%patch8 -p1
%patch9 -p1
+%patch10 -p1
%patch14 -p1
sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -269,6 +279,7 @@ common_options="
%endif
--with-debug
--with-error-checking=none
+ --enable-bignum=gmp
"
%if %{with nox}
@@ -294,6 +305,7 @@ done
# build with X
%configure $common_options \
--with-docdir=%{_libdir}/xemacs-%{xver}/doc \
+ --with-sound=nonative,alsa \
%if %{with xft}
--with-xft=all \
%else
@@ -336,7 +348,7 @@ Cflags: -I${includedir}
EOF
cat > macros.xemacs << EOF
-%%_xemacs_version %{version}
+%%_xemacs_version %{majver}
%%_xemacs_ev %{?epoch:%{epoch}:}%{version}
%%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
%%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages
@@ -411,6 +423,7 @@ install -Dpm 644 macros.xemacs $RPM_BUIL
# make sure nothing is 0400
chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
+chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh
# clean up unneeded stuff (TODO: there's probably much more)
find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm
@@ -579,6 +592,13 @@ fi
%changelog
+* Wed Oct 28 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-6
+- Bring back the courier font patch; that was a red herring.
+- Really, seriously fix bz 512623 with a TTY font patch.
+- Fix the version number in macros.xemacs.
+- Build with bignum support.
+- Turn off OSS support.
+
* Wed Sep 23 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-5
- Final fix for bz 512623, which is actually two bugs, because ...
- ... the courier font patch breaks TTY font detection. Removed that patch
More information about the fedora-extras-commits
mailing list