SHA256
1
0
forked from pool/emacs
Dr. Werner Fink 2012-06-29 15:31:37 +00:00 committed by Git OBS Bridge
parent 05ba032918
commit ef5f6488db
3 changed files with 1049 additions and 0 deletions

1034
emacs-24.1-configure.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 29 15:22:42 UTC 2012 - werner@suse.de
- make it build even for older distries
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 28 09:42:17 UTC 2012 - werner@suse.de Thu Jun 28 09:42:17 UTC 2012 - werner@suse.de

View File

@ -77,6 +77,7 @@ Source3: dot.gnu-emacs
Source4: emacs-rpmlintrc Source4: emacs-rpmlintrc
Source5: emacs.desktop Source5: emacs.desktop
Patch: emacs-24.1.dif Patch: emacs-24.1.dif
Patch1: emacs-24.1-configure.patch
Patch2: emacs-24.1-glibc.patch Patch2: emacs-24.1-glibc.patch
Patch3: emacs-24.1-decl.dif Patch3: emacs-24.1-decl.dif
Patch4: emacs-23.1-asian-print.patch Patch4: emacs-23.1-asian-print.patch
@ -196,6 +197,9 @@ if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
fi fi
%patch22 %patch22
%patch24 %patch24
%if 0%{?suse_version} < 1130
%patch1
%endif
# make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)
%if %suse_version >= 1110 %if %suse_version >= 1110
@ -292,7 +296,11 @@ DESKTOP="--with-x \
--without-gpm \ --without-gpm \
" "
GTK="${DESKTOP} \ GTK="${DESKTOP} \
%if 0%{?suse_version} > 1130
--with-x-toolkit=gtk3 \ --with-x-toolkit=gtk3 \
%else
--with-x-toolkit=gtk \
%endif
--x-includes=%{_x11inc} \ --x-includes=%{_x11inc} \
--x-libraries=%{_x11lib}:%{_x11data} \ --x-libraries=%{_x11lib}:%{_x11data} \
--with-xft \ --with-xft \
@ -348,7 +356,9 @@ make_mchkoff ()
export MALLOC_CHECK_ export MALLOC_CHECK_
fi fi
} }
%if 0%{?suse_version} >= 1130
autoconf autoconf
%endif
CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS} CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
make_mchkoff bootstrap make_mchkoff bootstrap
make -C lisp updates compile make -C lisp updates compile