kopia lustrzana https://gitlab.com/sane-project/website
165 wiersze
5.7 KiB
HTML
165 wiersze
5.7 KiB
HTML
<!-- received="Sat Mar 21 00:57:26 1998 PST" -->
|
||
<!-- sent="21 Mar 1998 00:56:11 -0800" -->
|
||
<!-- name="Ben Gertzfield" -->
|
||
<!-- email="che@debian.org" -->
|
||
<!-- subject="Updated patches for GTK+ 0.99.7 support" -->
|
||
<!-- id="" -->
|
||
<!-- inreplyto="" -->
|
||
<title>sane-devel: Updated patches for GTK+ 0.99.7 support</title>
|
||
<h1>Updated patches for GTK+ 0.99.7 support</h1>
|
||
<b>Ben Gertzfield</b> (<a href="mailto:che@debian.org"><i>che@debian.org</i></a>)<br>
|
||
<i>21 Mar 1998 00:56:11 -0800</i>
|
||
<p>
|
||
<ul>
|
||
<li> <b>Messages sorted by:</b> <a href="date.html#141">[ date ]</a><a href="index.html#141">[ thread ]</a><a href="subject.html#141">[ subject ]</a><a href="author.html#141">[ author ]</a>
|
||
<!-- next="start" -->
|
||
<li> <b>Next message:</b> <a href="0142.html">Hugo van der Kooij: "Re: Updated patches for GTK+ 0.99.7 support"</a>
|
||
<li> <b>Previous message:</b> <a href="0140.html">Ben Gertzfield: "Patches for building SANE with GTK+ 0.99.7 and above"</a>
|
||
<!-- nextthread="start" -->
|
||
<!-- reply="end" -->
|
||
</ul>
|
||
<!-- body="start" -->
|
||
I made a few small errors with the older patches, notably removing<br>
|
||
the ability to build dynamic libraries. Woops! Here's a set of<br>
|
||
fixed patches.<br>
|
||
<p>
|
||
As usual, email me with any problems.<br>
|
||
<p>
|
||
Ben<br>
|
||
<p>
|
||
diff -ruN sane-0.71.orig/frontend/gtkglue.c sane-0.71/frontend/gtkglue.c<br>
|
||
--- sane-0.71.orig/frontend/gtkglue.c Mon Jan 26 23:38:36 1998<br>
|
||
+++ sane-0.71/frontend/gtkglue.c Fri Mar 13 19:47:13 1998<br>
|
||
@@ -71,7 +71,7 @@<br>
|
||
set_tooltip (GtkTooltips *tooltips, GtkWidget *widget, const char *desc)<br>
|
||
{<br>
|
||
if (desc && desc[0])<br>
|
||
- gtk_tooltips_set_tips (tooltips, widget, (char *) desc);<br>
|
||
+ gtk_tooltips_set_tip (tooltips, widget, (char *) desc, NULL);<br>
|
||
}<br>
|
||
<br>
|
||
int<br>
|
||
@@ -808,7 +808,7 @@<br>
|
||
GSGDialogElement *elem;<br>
|
||
int i, j;<br>
|
||
<br>
|
||
- gtk_tooltips_unref (dialog->tooltips);<br>
|
||
+ gtk_object_unref (GTK_OBJECT (dialog->tooltips));<br>
|
||
gtk_widget_destroy (dialog->main_hbox);<br>
|
||
<br>
|
||
/* free the menu labels of integer/fix-point word-lists: */<br>
|
||
diff -ruN sane-0.71.orig/frontend/xcam.c sane-0.71/frontend/xcam.c<br>
|
||
--- sane-0.71.orig/frontend/xcam.c Mon Jan 19 23:39:51 1998<br>
|
||
+++ sane-0.71/frontend/xcam.c Fri Mar 13 19:47:17 1998<br>
|
||
@@ -896,7 +896,7 @@<br>
|
||
<br>
|
||
sane_init (NULL, 0);<br>
|
||
<br>
|
||
- gdk_set_debug_level (0);<br>
|
||
+ /* gdk_set_debug_level (0); */<br>
|
||
gdk_set_show_events (0);<br>
|
||
gtk_init (&argc, &argv);<br>
|
||
<br>
|
||
--- sane-0.71.orig/configure.in Mon Feb 23 21:46:04 1998<br>
|
||
+++ sane-0.71/configure.in Sat Mar 21 00:28:40 1998<br>
|
||
@@ -81,9 +81,6 @@<br>
|
||
AM_PROG_LIBTOOL<br>
|
||
<br>
|
||
dnl Checks for libraries.<br>
|
||
-<br>
|
||
-#### Choose a window system.<br>
|
||
-<br>
|
||
AC_PATH_X<br>
|
||
if test "$no_x" = yes; then<br>
|
||
window_system=none<br>
|
||
@@ -105,10 +102,6 @@<br>
|
||
AC_CHECK_FUNCS(dlopen, , enable_dynamic=no)],<br>
|
||
[enable_dynamic=no])<br>
|
||
fi<br>
|
||
-<br>
|
||
-# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used<br>
|
||
-# for the tests that follow. We set it back to REAL_CFLAGS later on.<br>
|
||
-<br>
|
||
HAVE_X11=yes<br>
|
||
if test "${HAVE_X11}" = "yes"; then<br>
|
||
DEFS="$C_SWITCH_X_SITE $DEFS"<br>
|
||
@@ -130,18 +123,23 @@<br>
|
||
AC_CHECK_LIB(Xext,main)<br>
|
||
AC_CHECK_LIB(Xpm,main)<br>
|
||
LIBX11="$LIBS"<br>
|
||
- AC_CHECK_LIB(glib,main)<br>
|
||
- AC_CHECK_LIB(gdk,main)<br>
|
||
- AC_CHECK_LIB(gtk,gtk_gamma_curve_new,XSCAN="xscanimage xcam";<br>
|
||
- LIBS="-lgtk ${LIBS}")<br>
|
||
- LIBGTK="$LIBS"<br>
|
||
+<br>
|
||
+ AM_PATH_GTK(,XSCAN="xscanimage xcam",AC_MSG_WARN(GTK not found. Skipping xscanimage/xcam. Is gtk-config in your path?))<br>
|
||
+<br>
|
||
+ GIMP_SAVECPPFLAGS="$CFLAGS"<br>
|
||
+ LIBS="$LIBS $GTK_LIBS"<br>
|
||
+ CPPFLAGS="$CFLAGS $GTK_CFLAGS"<br>
|
||
+<br>
|
||
AC_CHECK_HEADERS(libgimp/gimp.h,LIBGIMP="-lgimp")<br>
|
||
+<br>
|
||
+<br>
|
||
LIBS="$SAVED_LIBS"<br>
|
||
+ CPPFLAGS="$GIMP_SAVECPPFLAGS"<br>
|
||
fi<br>
|
||
AC_SUBST(XSCAN)<br>
|
||
AC_SUBST(LIBX11)<br>
|
||
-AC_SUBST(LIBGTK)<br>
|
||
AC_SUBST(LIBGIMP)<br>
|
||
+<br>
|
||
CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \<br>
|
||
-DPATH_SANE_DATA_DIR=\$(datadir) \<br>
|
||
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"<br>
|
||
<p>
|
||
--- sane-0.71.orig/frontend/Makefile.in Tue Nov 4 23:36:47 1997<br>
|
||
+++ sane-0.71/frontend/Makefile.in Sat Mar 21 00:33:31 1998<br>
|
||
@@ -28,13 +28,13 @@<br>
|
||
<br>
|
||
CC = @CC@<br>
|
||
INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include \<br>
|
||
- -I/usr/local/include<br>
|
||
+ -I/usr/local/include @GTK_CFLAGS@<br>
|
||
CPPFLAGS = @CPPFLAGS@<br>
|
||
CFLAGS = @CFLAGS@<br>
|
||
LDFLAGS = @LDFLAGS@<br>
|
||
LIBS = @LIBS@<br>
|
||
-LIBX11 = @LIBX11@<br>
|
||
-LIBGTK = @LIBGTK@<br>
|
||
+GTK_CFLAGS = @GTK_CFLAGS@<br>
|
||
+GTK_LIBS = @GTK_LIBS@<br>
|
||
DEFS = @DEFS@<br>
|
||
<br>
|
||
LIBTOOL = ../libtool<br>
|
||
@@ -88,11 +88,11 @@<br>
|
||
<br>
|
||
xscanimage: $(XSCAN_OBJS) $(LIBSANEI) $(LIBSANE) $(LIBLIB)<br>
|
||
@$(LIBTOOL) $(MLINK) $(LINK) $(XSCAN_OBJS) $(LIBSANEI) $(LIBSANE) \<br>
|
||
- $(LIBLIB) @LIBGIMP@ $(LIBGTK)<br>
|
||
+ $(LIBLIB) @LIBGIMP@ $(GTK_LIBS) $(GTK_CFLAGS) $(LIBS)<br>
|
||
<br>
|
||
xcam: $(XCAM_OBJS) $(LIBSANE) $(LIBSANEI) $(LIBLIB)<br>
|
||
@$(LIBTOOL) $(MLINK) $(LINK) $(XCAM_OBJS) $(LIBSANEI) $(LIBSANE) \<br>
|
||
- $(LIBLIB) $(LIBGTK)<br>
|
||
+ $(LIBLIB) $(GTK_LIBS) $(GTK_CFLAGS) $(LIBS)<br>
|
||
<br>
|
||
clean:<br>
|
||
rm -f *.o *~ .*~ *.bak<br>
|
||
<p>
|
||
<pre>
|
||
--
|
||
Source code, list archive, and docs: <a href="http://www.mostang.com/sane/">http://www.mostang.com/sane/</a>
|
||
To unsubscribe: echo unsubscribe sane-devel | mail <a href="mailto:majordomo@mostang.com">majordomo@mostang.com</a>
|
||
</pre>
|
||
<!-- body="end" -->
|
||
<p>
|
||
<ul>
|
||
<!-- next="start" -->
|
||
<li> <b>Next message:</b> <a href="0142.html">Hugo van der Kooij: "Re: Updated patches for GTK+ 0.99.7 support"</a>
|
||
<li> <b>Previous message:</b> <a href="0140.html">Ben Gertzfield: "Patches for building SANE with GTK+ 0.99.7 and above"</a>
|
||
<!-- nextthread="start" -->
|
||
<!-- reply="end" -->
|
||
</ul>
|