gtk-mist-engine patch



Hey, try out this patch if you want, it should make it compile
gtk-mist-engine without gtk1.  Is there a better place to send patches
guys?  I don't have gtk1 and I know this isn't the only thing that
depends on it (redhat-artwork comes to mind).

--
Samuel Stringham
diff -Nru gnome/gtk-mist-engine/Makefile gnome/gtk-mist-engine.new/Makefile
--- gnome/gtk-mist-engine/Makefile	2003-02-05 15:24:19.000000000 -0500
+++ gnome/gtk-mist-engine.new/Makefile	2003-02-08 10:28:44.000000000 -0500
@@ -2,6 +2,7 @@
 GARVERSION = 0.9
 CATEGORIES = gnome
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = no-gtk1.patch
 
 MASTER_SITES = http://primates.ximian.com/~dave/mist/
 
diff -Nru gnome/gtk-mist-engine/checksums gnome/gtk-mist-engine.new/checksums
--- gnome/gtk-mist-engine/checksums	2003-02-05 15:24:19.000000000 -0500
+++ gnome/gtk-mist-engine.new/checksums	2003-02-08 10:27:47.000000000 -0500
@@ -1 +1,2 @@
 01158d17742c32154a1a7768db215cf3  download/gtk-mist-engine-0.9.tar.gz
+bc13557fc146a1d2ce597cde156377da  files/no-gtk1.patch
diff -Nru gnome/gtk-mist-engine/files/no-gtk1.patch gnome/gtk-mist-engine.new/files/no-gtk1.patch
--- gnome/gtk-mist-engine/files/no-gtk1.patch	1969-12-31 19:00:00.000000000 -0500
+++ gnome/gtk-mist-engine.new/files/no-gtk1.patch	2003-02-08 10:27:35.000000000 -0500
@@ -0,0 +1,151 @@
+diff -Nru gtk-mist-engine-0.9/Makefile.am gtk-mist-engine-0.9.new/Makefile.am
+--- tmp/gtk-mist-engine-0.9/Makefile.am	2002-09-06 20:00:18.000000000 -0400
++++ work/gtk-mist-engine-0.9/Makefile.am	2003-02-08 10:01:45.000000000 -0500
+@@ -1,3 +1,3 @@
+-SUBDIRS = gtk1 src Theme
++SUBDIRS = src Theme
+ 
+ EXTRA_DIST = autogen.sh
+diff -Nru gtk-mist-engine-0.9/configure.in gtk-mist-engine-0.9.new/configure.in
+--- tmp/gtk-mist-engine-0.9/configure.in	2002-11-11 00:07:28.000000000 -0500
++++ work/gtk-mist-engine-0.9/configure.in	2003-02-08 10:01:35.000000000 -0500
+@@ -31,10 +31,6 @@
+ AC_SUBST(MIST_CFLAGS)
+ AC_SUBST(MIST_LIBS)
+ 
+-PKG_CHECK_MODULES(GTK1, gtk+ >= 1.2.10,,
+-			AC_MSG_ERROR([GTK+-1.2.10 is required to compile mist]))
+-AC_SUBST(GTK1_CFLAGS)
+-AC_SUBST(GTK1_LIBS)
+ 
+ GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+ AC_SUBST(GTK_VERSION)
+--- tmp/gtk-mist-engine-0.9/configure	2003-02-08 10:20:50.000000000 -0500
++++ work/gtk-mist-engine-0.9/configure	2003-02-08 10:21:01.000000000 -0500
+@@ -7643,106 +7643,6 @@
+ 
+ 
+ 
+-  succeeded=no
+-
+-  if test -z "$PKG_CONFIG"; then
+-    # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+-  ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+-if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  fi
+-
+-  if test "$PKG_CONFIG" = "no" ; then
+-     echo "*** The pkg-config script could not be found. Make sure it is"
+-     echo "*** in your path, or set the PKG_CONFIG environment variable"
+-     echo "*** to the full path to pkg-config."
+-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+-  else
+-     PKG_CONFIG_MIN_VERSION=0.9.0
+-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for gtk+ >= 1.2.10" >&5
+-echo $ECHO_N "checking for gtk+ >= 1.2.10... $ECHO_C" >&6
+-
+-        if $PKG_CONFIG --exists "gtk+ >= 1.2.10" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-            succeeded=yes
+-
+-            echo "$as_me:$LINENO: checking GTK1_CFLAGS" >&5
+-echo $ECHO_N "checking GTK1_CFLAGS... $ECHO_C" >&6
+-            GTK1_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.10"`
+-            echo "$as_me:$LINENO: result: $GTK1_CFLAGS" >&5
+-echo "${ECHO_T}$GTK1_CFLAGS" >&6
+-
+-            echo "$as_me:$LINENO: checking GTK1_LIBS" >&5
+-echo $ECHO_N "checking GTK1_LIBS... $ECHO_C" >&6
+-            GTK1_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.10"`
+-            echo "$as_me:$LINENO: result: $GTK1_LIBS" >&5
+-echo "${ECHO_T}$GTK1_LIBS" >&6
+-        else
+-            GTK1_CFLAGS=""
+-            GTK1_LIBS=""
+-            ## If we have a custom action on failure, don't print errors, but
+-            ## do set a variable so people can do so.
+-            GTK1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+ >= 1.2.10"`
+-
+-        fi
+-
+-
+-
+-     else
+-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+-        echo "*** See http://www.freedesktop.org/software/pkgconfig";
+-     fi
+-  fi
+-
+-  if test $succeeded = yes; then
+-     :
+-  else
+-     { { echo "$as_me:$LINENO: error: GTK+-1.2.10 is required to compile mist" >&5
+-echo "$as_me: error: GTK+-1.2.10 is required to compile mist" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-
+-
+-
+-
+ GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+ 
+ 
+@@ -8747,8 +8647,6 @@
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@MIST_CFLAGS@,$MIST_CFLAGS,;t t
+ s,@MIST_LIBS@,$MIST_LIBS,;t t
+-s,@GTK1_CFLAGS@,$GTK1_CFLAGS,;t t
+-s,@GTK1_LIBS@,$GTK1_LIBS,;t t
+ s,@GTK_VERSION@,$GTK_VERSION,;t t
+ CEOF
+ 
+--- tmp/gtk-mist-engine-0.9/Makefile.in	2002-11-11 00:09:39.000000000 -0500
++++ work/gtk-mist-engine-0.9/Makefile.in	2003-02-08 10:26:37.000000000 -0500
+@@ -90,7 +90,7 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+-SUBDIRS = gtk1 src Theme
++SUBDIRS = src Theme
+ 
+ EXTRA_DIST = autogen.sh
+ subdir = .


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]