OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Jan-2005 13:36:25
Branch: HEAD Handle: 2005011912362500
Added files:
openpkg-src/xemacs xemacs.patch
Modified files:
openpkg-src/xemacs xemacs.spec
Log:
removed testing for libglade completely since our libglade is building
against gtk2 and xemacs builds against gtk. This discrepancy prevents
xemacs from building if libglade is installed
Summary:
Revision Changes Path
1.1 +145 -0 openpkg-src/xemacs/xemacs.patch
1.31 +4 -2 openpkg-src/xemacs/xemacs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xemacs/xemacs.patch
============================================================================
$ cvs diff -u -r0 -r1.1 xemacs.patch
--- /dev/null 2005-01-19 13:36:25 +0100
+++ xemacs.patch 2005-01-19 13:36:25 +0100
@@ -0,0 +1,145 @@
+Index: configure
+--- configure.orig 2004-03-25 22:07:12 +0100
++++ configure 2005-01-19 13:16:43 +0100
+@@ -5339,46 +5339,6 @@
+ CFLAGS="${GTK_CFLAGS} ${CFLAGS}"
+ CPPFLAGS="${GTK_CFLAGS} ${CFLAGS}"
+ LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
+- for ac_hdr in glade/glade.h glade.h
+-do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5347: checking for $ac_hdr" >&5
+-
+-cat > conftest.$ac_ext <<EOF
+-#line 5350 "configure"
+-#include "confdefs.h"
+-#include <$ac_hdr>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+- rm -rf conftest*
+- eval "ac_cv_header_$ac_safe=yes"
+-else
+- echo "$ac_err" >&5
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_header_$ac_safe=no"
+-fi
+-rm -f conftest*
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- ac_tr_hdr=HAVE_`echo $ac_hdr | sed
'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+- { test "$extra_verbose" = "yes" && cat << EOF
+- Defining $ac_tr_hdr
+-EOF
+-cat >> confdefs.h <<EOF
+-#define $ac_tr_hdr 1
+-EOF
+-}
+-
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-done
+
+
+ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
+@@ -5415,94 +5375,6 @@
+
+
+
+-echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
+-echo "configure:5420: checking for main in -lglade" >&5
+-ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
+-
+-xe_check_libs=" -lglade "
+-cat > conftest.$ac_ext <<EOF
+-#line 5425 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-main()
+-; return 0; }
+-EOF
+-if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-xe_check_libs=""
+-
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+- echo "$ac_t""yes" 1>&6
+- libs_gtk="-lglade $libs_gtk" && if test "$extra_verbose" = "yes"; then
echo " Prepending \"-lglade\" to \$libs_gtk"; fi
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-
+-echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
+-echo "configure:5454: checking for main in -lglade-gnome" >&5
+-ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
+-
+-xe_check_libs=" -lglade-gnome "
+-cat > conftest.$ac_ext <<EOF
+-#line 5459 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-main()
+-; return 0; }
+-EOF
+-if { (eval echo configure:5466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-xe_check_libs=""
+-
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+- echo "$ac_t""yes" 1>&6
+- libs_gtk="-lglade-gnome $libs_gtk" && if test "$extra_verbose" = "yes";
then echo " Prepending \"-lglade-gnome\" to \$libs_gtk"; fi
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+-
+- cat > conftest.$ac_ext <<EOF
+-#line 5487 "configure"
+-#include "confdefs.h"
+-#include <glade/glade-xml.h>
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- egrep "char \*txtdomain;" >/dev/null 2>&1; then
+- rm -rf conftest*
+- echo "$ac_t""yes" 1>&6
+- { test "$extra_verbose" = "yes" && cat << \EOF
+- Defining LIBGLADE_XML_TXTDOMAIN = 1
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define LIBGLADE_XML_TXTDOMAIN 1
+-EOF
+-}
+-
+-else
+- rm -rf conftest*
+- echo "$ac_t""no" 1>&6
+-fi
+ rm -f conftest*
+
+ CFLAGS="${OLD_CFLAGS}"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xemacs/xemacs.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 xemacs.spec
--- openpkg-src/xemacs/xemacs.spec 1 Jan 2005 10:55:59 -0000 1.30
+++ openpkg-src/xemacs/xemacs.spec 19 Jan 2005 12:36:25 -0000 1.31
@@ -25,7 +25,7 @@
# package versions
%define V_xemacs 21.4.16
-%define V_sumo 2004-08-18
+%define V_sumo 2005-01-18
# package information
Name: xemacs
@@ -38,7 +38,7 @@
Group: Editor
License: GPL
Version: %{V_xemacs}
-Release: 20041212
+Release: 20050119
# package options
%option with_gtk yes
@@ -47,6 +47,7 @@
# list of sources
Source0:
ftp://ftp.xemacs.org/pub/xemacs/stable/xemacs-%{V_xemacs}.tar.gz
Source1:
ftp://ftp.xemacs.org/pub/xemacs/packages/xemacs-sumo-%{V_sumo}.tar.gz
+Patch0: xemacs.patch
# build information
Prefix: %{l_prefix}
@@ -82,6 +83,7 @@
%prep
%setup -q
+ %patch -p0
%build
# configure package
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
