mirror
/
sane-project-website
kopia lustrzana https://gitlab.com/sane-project/website
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
sane-project-website/old-archive/1998-03/0140.html

199 wiersze
7.2 KiB
HTML
Czysty Bezpośredni odnośnik Wina Historia

This file contains invisible Unicode characters!

This file contains invisible Unicode characters that may be processed differently from what appears below. If your use case is intentional and legitimate, you can safely ignore this warning. Use the Escape button to reveal hidden characters.

<!-- received="Fri Mar 20 22:22:58 1998 PST" -->
<!-- sent="20 Mar 1998 22:21:39 -0800" -->
<!-- name="Ben Gertzfield" -->
<!-- email="che@debian.org" -->
<!-- subject="Patches for building SANE with GTK+ 0.99.7 and above" -->
<!-- id="" -->
<!-- inreplyto="" -->
<title>sane-devel: Patches for building SANE with GTK+ 0.99.7 and above</title>
<h1>Patches for building SANE with GTK+ 0.99.7 and above</h1>
<b>Ben Gertzfield</b> (<a href="mailto:che@debian.org"><i>che@debian.org</i></a>)<br>
<i>20 Mar 1998 22:21:39 -0800</i>
<p>
<ul>
<li> <b>Messages sorted by:</b> <a href="date.html#140">[ date ]</a><a href="index.html#140">[ thread ]</a><a href="subject.html#140">[ subject ]</a><a href="author.html#140">[ author ]</a>
<!-- next="start" -->
<li> <b>Next message:</b> <a href="0141.html">Ben Gertzfield: "Updated patches for GTK+ 0.99.7 support"</a>
<li> <b>Previous message:</b> <a href="0139.html">Matto Marjanovic: "a "hints" page for the AVA-1502"</a>
<!-- nextthread="start" -->
<!-- reply="end" -->
</ul>
<!-- body="start" -->
The following patches are to a pristine SANE 0.71 and patch a few<br>
problems with GTK support:<br>
<p>
* API changes to GTK+ 0.99.3 <br>
* gtk-config program and gtk.m4 autoconf support provide proper<br>
include paths and -l flags; modified configure.in and<br>
frontends/Makefile.in to accomodate changes for this.<br>
<p>
Please let me know if anyone runs into any problems with these<br>
patches. These patches *require* GTK+ 0.99.7 and above.<br>
<p>
I'm not currently subscribed to sane-devel, so please Cc: responses<br>
to me.<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 &amp;&amp; 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-&gt;tooltips);<br>
+ gtk_object_unref (GTK_OBJECT (dialog-&gt;tooltips));<br>
gtk_widget_destroy (dialog-&gt;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 (&amp;argc, &amp;argv);<br>
<br>
--- sane-0.71.orig/configure.in Mon Feb 23 21:46:04 1998<br>
+++ sane-0.71/configure.in Fri Mar 20 21:17:14 1998<br>
@@ -82,66 +82,20 @@<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>
-else<br>
- window_system=x11<br>
-fi<br>
-<br>
-if test "${x_libraries}" != NONE &amp;&amp; test -n "${x_libraries}"; then<br>
- LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`<br>
- LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`<br>
-fi<br>
-if test "${x_includes}" != NONE &amp;&amp; test -n "${x_includes}"; then<br>
- C_SWITCH_X_SITE=-I`echo ${x_includes} | sed -e "s/:/ -I/g"`<br>
-fi<br>
-<br>
-if test "${enable_dynamic}" != "no"; then<br>
- AC_CHECK_HEADERS(dlfcn.h,<br>
- [AC_CHECK_LIB(dl,dlopen)<br>
- AC_CHECK_FUNCS(dlopen, , enable_dynamic=no)],<br>
- [enable_dynamic=no])<br>
-fi<br>
+AM_PATH_GTK(,XSCAN="xscanimage xcam",AC_MSG_WARN(GTK not found. Skipping xscanimage/xcam. Is gtk-config in your path?))<br>
+AC_SUBST(XSCAN)<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>
+GIMP_SAVELIBS=$LIBS<br>
+GIMP_SAVECPPFLAGS=$CFLAGS<br>
+LIBS="$LIBS $GTK_LIBS"<br>
+CPPFLAGS="$CFLAGS $GTK_CFLAGS"<br>
<br>
-HAVE_X11=yes<br>
-if test "${HAVE_X11}" = "yes"; then<br>
- DEFS="$C_SWITCH_X_SITE $DEFS"<br>
- LDFLAGS="$LDFLAGS $LD_SWITCH_X_SITE"<br>
- LIBS="$LIBX $LIBS"<br>
- CFLAGS="$C_SWITCH_X_SITE $CFLAGS"<br>
+AC_CHECK_HEADERS(libgimp/gimp.h,LIBGIMP="-lgimp")<br>
+AC_SUBST(LIBGIMP)<br>
<br>
- # On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests.<br>
- # This is handled by LD_SWITCH_X_SITE_AUX during the real build,<br>
- # but it's more convenient here to set LD_RUN_PATH<br>
- # since this also works on hosts that don't understand LD_SWITCH_X_SITE_AUX.<br>
- if test "${x_libraries}" != NONE &amp;&amp; test -n "${x_libraries}"; then<br>
- LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH<br>
- export LD_RUN_PATH<br>
- fi<br>
+LIBS=$GIMP_SAVELIBS<br>
+CPPFLAGS=$GIMP_SAVECPPFLAGS<br>
<br>
- SAVED_LIBS="$LIBS"<br>
- AC_CHECK_LIB(X11,main)<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>
- AC_CHECK_HEADERS(libgimp/gimp.h,LIBGIMP="-lgimp")<br>
- LIBS="$SAVED_LIBS"<br>
-fi<br>
-AC_SUBST(XSCAN)<br>
-AC_SUBST(LIBX11)<br>
-AC_SUBST(LIBGTK)<br>
-AC_SUBST(LIBGIMP)<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 Fri Mar 20 21:39:39 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)<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)<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="0141.html">Ben Gertzfield: "Updated patches for GTK+ 0.99.7 support"</a>
<li> <b>Previous message:</b> <a href="0139.html">Matto Marjanovic: "a "hints" page for the AVA-1502"</a>
<!-- nextthread="start" -->
<!-- reply="end" -->
</ul>
Reference in New Issue View Git Blame Kopiuj bezpośredni odnośnik