rpms/xemacs/devel xemacs-21.5.26-gtk-gcc4.patch, NONE, 1.1 xemacs-21.5.26-utf8-fonts.patch, NONE, 1.1 xemacs.spec, 1.22, 1.23 xemacs-21.5.25-utf8-fonts.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Apr 15 16:58:44 UTC 2006
Author: scop
Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28998
Modified Files:
xemacs.spec
Added Files:
xemacs-21.5.26-gtk-gcc4.patch xemacs-21.5.26-utf8-fonts.patch
Removed Files:
xemacs-21.5.25-utf8-fonts.patch
Log Message:
* Sat Apr 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.26-3
- Don't expect to find ellcc if building without modules (#188929).
- New --with/--without rpmbuild flags:
- xft: enable/disable Xft support, default disabled.
- nox: enable/disable building the non-X version, default enabled
- modules: enable/disable module support, default arch-dependent.
- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE).
- Move gnuserv to -common, gnudoit to base package, drop gnuattach.
- Split ellcc and headers to -devel subpackage.
- Drop unneeded libXaw-devel build dependency.
- Move -nox "man page" to -nox subpackage.
- Fix GTK build and glade detection for it.
- Avoid -common dependency on ALSA.
xemacs-21.5.26-gtk-gcc4.patch:
--- NEW FILE xemacs-21.5.26-gtk-gcc4.patch ---
--- xemacs-21.5.26/src/glyphs-gtk.c~ 2005-11-22 13:24:44.000000000 +0200
+++ xemacs-21.5.26/src/glyphs-gtk.c 2006-04-14 23:57:23.000000000 +0300
@@ -796,7 +796,7 @@
find_keyword_in_vector (instantiator, Q_file);
IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
- IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+ IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
@@ -837,7 +837,7 @@
IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = Qnil;
IMAGE_INSTANCE_GTK_PIXMAP (ii) = gdk_pixmap;
- IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+ IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = width;
IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = height;
IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth;
@@ -2972,7 +2972,7 @@
IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
/* Make sure there aren't two pointers to the same mask, causing
it to get freed twice. */
- IMAGE_INSTANCE_GTK_MASK (p) = 0;
+ IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
break;
default:
xemacs-21.5.26-utf8-fonts.patch:
--- NEW FILE xemacs-21.5.26-utf8-fonts.patch ---
--- xemacs-21.5.26/etc/Emacs.ad.orig 2003-03-27 14:57:44.000000000 +0200
+++ xemacs-21.5.26/etc/Emacs.ad 2006-04-14 20:37:56.000000000 +0300
@@ -198,8 +198,12 @@
! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0
!
-*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+
+XEmacs*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \
+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
+ *
*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
-*-*-*-*-*-*-*-120-*-iso10646-1, \
-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
@@ -211,7 +215,7 @@
! Gui elements share this font
!
-Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
@@ -227,7 +231,7 @@
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.
-*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*
! Dialog box translations.
! =======================
Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xemacs.spec 6 Apr 2006 16:27:53 -0000 1.22
+++ xemacs.spec 15 Apr 2006 16:58:44 -0000 1.23
@@ -1,24 +1,26 @@
-# TODO: xft build option
-# TODO: site-modules vs site-lisp -> to same dir (are modules noarch?)
# TODO: review desktop entry associations
-# TODO: split off -devel?
# TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el
# TODO: non-ASCII in buffer tabs
-# TODO: re-enable XFontSet support for menubars? --> see suse fontset patch
# TODO: build issues if previous 21.5.x installed, restore finder-inf stuff?
-# TODO: gtk+ build doesn't find glade, need pkg-config libglade --cflags
-# TODO: gtk+ build fails, invalid lvalues
+# TODO: fix --without modules build (../modules/canna_api.o not found?)
%bcond_with gtk
%bcond_with xaw3d
+%bcond_with xft
%bcond_without mule
+%bcond_without nox
%bcond_without stackprot
+%ifarch ia64
+%bcond_with modules
+%else
+%bcond_without modules
+%endif
%define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/')
Name: xemacs
Version: 21.5.26
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
@@ -31,13 +33,15 @@
Source4: default.el
Source5: xemacs-sitestart.el
-Patch0: %{name}-21.5.25-utf8-fonts.patch
+Patch0: %{name}-21.5.26-utf8-fonts.patch
Patch1: %{name}-21.5.25-x-paths.patch
# TODO: patch2 still needed with --with-system-packages???
Patch2: %{name}-21.5.25-find-paths-pkgdir.patch
Patch3: %{name}-21.5.25-mk-nochk-features.patch
Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch
Patch5: %{name}-21.5.25-wnnfix-128362.patch
+# http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html
+Patch6: %{name}-21.5.26-gtk-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,25 +61,24 @@
BuildRequires: Canna-devel
BuildRequires: FreeWnn-devel
%endif # mule
-
BuildRequires: xmkmf
BuildRequires: libXau-devel
BuildRequires: libXpm-devel
BuildRequires: alsa-lib-devel
-# TODO: verify this wrt gtk/xaw3d build
-BuildRequires: xorg-x11-xbitmaps
%if %{with gtk}
BuildRequires: gtk+-devel
BuildRequires: libglade-devel
-%else
-# TODO: verify this wrt xaw3d
-BuildRequires: libXaw-devel
+%else # gtk
+BuildRequires: xorg-x11-xbitmaps
%if %{with xaw3d}
BuildRequires: Xaw3d-devel
-%else
+%else # xaw3d
BuildRequires: neXtaw-devel
%endif # xaw3d
%endif # gtk
+%if %{with xft}
+BuildRequires: libXft-devel
+%endif # xft
Requires: xemacs-sumo >= 20050118-2
Requires: xemacs-common = %{version}-%{release}
Requires: xorg-x11-fonts-ISO8859-1-75dpi
@@ -149,6 +152,20 @@
This package contains XEmacs documentation in GNU texinfo format.
+%package devel
+Summary: Development files for XEmacs
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+XEmacs is a highly customizable open source text editor and
+application development system. It is protected under the GNU General
+Public License and related to other versions of Emacs, in particular
+GNU Emacs. Its emphasis is on modern graphical user interface support
+and an open software development model, similar to Linux.
+
+This package contains XEmacs development support files.
+
%prep
%setup -q
@@ -164,6 +181,7 @@
%patch4 -p1
%endif
%patch5 -p1
+%patch6 -p1
for f in man/lispref/mule.texi man/xemacs-faq.texi ; do
iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -179,6 +197,9 @@
CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
%endif
+%if %{with gtk}
+CFLAGS="$CFLAGS $(pkg-config libglade --cflags)"
+%endif
export CFLAGS
export EMACSLOADPATH=$PWD/lisp
@@ -199,15 +220,15 @@
%ifarch alpha ia64 ppc64
--with-system-malloc
%endif
-%ifarch ia64
+%if ! %{with modules}
--without-modules
%endif
"
+%if %{with nox}
# build without X
-# note: docdir requires trailing slash # TODO: still in 21.5?
%configure $common_options \
- --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox/ \
+ --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \
--with-sound=none \
--without-x \
--without-canna \
@@ -220,11 +241,14 @@
mv lib-src/DOC{,-nox}
mv src/xemacs{,-nox-%{xver}}
mv lib-src/config.values{,-nox}
+# grab these from -nox, the X ones may have deps on ALSA, X, etc
+for file in {e,oo}tags gnuserv {fake,move}mail yow ; do
+ mv lib-src/$file{,-mindep}
+done
+%endif # nox
# build with X
-# note: docdir requires trailing slash # TODO: still in 21.5?
%configure $common_options \
- --with-docdir=%{_libdir}/xemacs-%{xver}/doc/ \
%if %{with gtk}
--with-gtk \
--with-gnome \
@@ -236,7 +260,12 @@
--with-scrollbars=lucid \
--with-dialogs=athena \
%endif
- --without-xfs
+%if %{with xft}
+ --with-xft=all \
+%else
+ --with-xfs \
+%endif
+ --with-docdir=%{_libdir}/xemacs-%{xver}/doc
# toplevel smp build fails
make %{?_smp_mflags} -C lib-src
make src/Emacs.ad.h
@@ -249,14 +278,19 @@
export EMACSLOADPATH=$PWD/lisp
+%if %{with nox}
+# restore binaries with less dependencies; note: no -p nor move
+for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done
+%endif
+
# note: no DESTDIR support
-# note: docdir requires trailing slash # TODO: still in 21.5?
%makeinstall \
mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
- docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc/
-echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1
+ docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc
+%if %{with nox}
# install nox files
+echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1
install -pm 755 src/xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}
ln -s xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox
@@ -264,6 +298,7 @@
$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC
install -pm 644 lib-src/config.values-nox \
$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values
+%endif # nox
# these clash with GNU Emacs
mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs}
@@ -309,8 +344,9 @@
# clean up unneeded stuff (TODO: there's probably much more)
find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs rm
rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh
+rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1}
cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc
-rm -r InstallGuide sparcworks tests XKeysymDB *.sco *.1
+rm -r editclient.sh InstallGuide sparcworks tests XKeysymDB *.sco *.1
cd -
# separate files
@@ -388,53 +424,85 @@
%files
%defattr(-,root,root,-)
+# gnuclient needs X libs, so not in -common
+%{_bindir}/gnuclient
+%{_bindir}/gnudoit
%ghost %{_bindir}/xemacs
%{_bindir}/xemacs-%{xver}
-# gnuclient, gnuserv need X libs, so not in -common
-%{_bindir}/gnuclient
-%{_libdir}/xemacs-%{xver}/*linux/gnuserv
%{_libdir}/xemacs-%{xver}/doc/
+%if %{with modules}
+%{_libdir}/xemacs-%{xver}/*linux/modules/canna_api.ell
+%endif
%{_datadir}/applications/*-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
%{_mandir}/man1/gnuclient.1*
-%{_mandir}/man1/gnuserv.1*
+%{_mandir}/man1/gnudoit.1*
+%if %{with nox}
%files nox
%defattr(-,root,root,-)
%ghost %{_bindir}/xemacs
%{_bindir}/xemacs-nox
%{_bindir}/xemacs-nox-%{xver}
%{_libdir}/xemacs-%{xver}/doc-nox/
+%{_mandir}/man1/xemacs-nox.1*
+%endif
%files common -f base-files
%defattr(-,root,root,-)
%doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL
%doc etc/editclient.sh
-%{_bindir}/ellcc
%{_bindir}/etags.xemacs
-%{_bindir}/gnuattach
-%{_bindir}/gnudoit
%{_bindir}/ootags
%{_libdir}/xemacs/
%dir %{_libdir}/xemacs-%{xver}
%dir %{_libdir}/xemacs-%{xver}/*linux/
-%{_libdir}/xemacs-%{xver}/*linux/[acdfhimprsvwy]*
+%{_libdir}/xemacs-%{xver}/*linux/[acdfghprsvwy]*
+%{_libdir}/xemacs-%{xver}/*linux/m[am]*
+%{_libdir}/xemacs-%{xver}/*linux/movemail
+%if %{with modules}
+%dir %{_libdir}/xemacs-%{xver}/*linux/modules/
+%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.elc
+%endif
%config(noreplace) %{_sysconfdir}/skel/.xemacs/
%{_mandir}/man1/etags.xemacs.1*
-%{_mandir}/man1/gnuattach.1*
-%{_mandir}/man1/gnudoit.1*
-%{_mandir}/man1/xemacs*.1*
+%{_mandir}/man1/gnuserv.1*
+%{_mandir}/man1/xemacs.1*
%dir %{_localstatedir}/lock/xemacs/
%files el -f el-files
%defattr(-,root,root,-)
+%if %{with modules}
+%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.el
+%endif
%files info -f info-files
%defattr(-,root,root,-)
%{_infodir}/*.info*
+%files devel
+%defattr(-,root,root,-)
+%if %{with modules}
+%{_bindir}/ellcc
+%endif
+%{_libdir}/xemacs-%{xver}/*linux/include/
+
%changelog
+* Sat Apr 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.26-3
+- Don't expect to find ellcc if building without modules (#188929).
+- New --with/--without rpmbuild flags:
+ - xft: enable/disable Xft support, default disabled.
+ - nox: enable/disable building the non-X version, default enabled
+ - modules: enable/disable module support, default arch-dependent.
+- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE).
+- Move gnuserv to -common, gnudoit to base package, drop gnuattach.
+- Split ellcc and headers to -devel subpackage.
+- Drop unneeded libXaw-devel build dependency.
+- Move -nox "man page" to -nox subpackage.
+- Fix GTK build and glade detection for it.
+- Avoid -common dependency on ALSA.
+
* Thu Apr 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.26-2
- Borrow Mike Fabian's site-start.el work from the SuSE package.
--- xemacs-21.5.25-utf8-fonts.patch DELETED ---
More information about the fedora-extras-commits
mailing list