svn commit: r517720 - in head/graphics/sane-backends: . files

[Tobias Kortkamp]

On Sat, Nov 16, 2019 at 02:58:56PM +0100, Christoph Moench-Tegeder wrote:
> ## Tobias Kortkamp (tobik at FreeBSD.org):
> 
> > Log:
> >   graphics/sane-backends: Update to 1.0.28
> 
> This broke graphics/sane-frontends, and gscan2pdf by extension.
> 
> > Deleted:
> >   head/graphics/sane-backends/files/patch-include__sane__sane.h
> 
> And this is why (beyond that, sane-frontends now throws quite a racket
> during build because it relied on #include's in sane-backend's header
> files which were "cleaned up" here as well).

Hmm, sorry about that.

Fedora applies the following patch to sane-frontends for this which
I think we could apply to it too.

Not sure what you mean by racket though?  There are no new warnings
in sane-frontends beyond the SANE_CAP_ALWAYS_SETTABLE thing with
sane-backends-1.0.28 [0] than what was there already with
sane-backends-1.0.27 [1].  Maybe I'm missing something.

[0] https://people.freebsd.org/~tobik/logs/sane-frontends-1.0.14_10.log 
[1] http://beefy6.nyi.freebsd.org/data/120amd64-default/517298/logs/sane-frontends-1.0.14_10.log

Index: graphics/sane-frontends/files/patch-src_gtkglue.c
===================================================================
--- graphics/sane-frontends/files/patch-src_gtkglue.c	(nonexistent)
+++ graphics/sane-frontends/files/patch-src_gtkglue.c	(working copy)
@@ -0,0 +1,29 @@
+commit ddd90b1502a263d03938b1e45a57684d576993ba
+Author: Nils Philippsen <nils at redhat.com>
+Date:   Fri Jul 31 16:25:58 2009 +0200
+
+    patch: sane-backends-1.0.20
+    
+    Squashed commit of the following:
+    
+    commit 0c84326fa37bb309481c4d2658ab6cb17c9f0e85
+    Author: Nils Philippsen <nils at redhat.com>
+    Date:   Fri Jul 31 16:18:59 2009 +0200
+    
+        use SANE_CAP_ALWAYS_SETTABLE only if available
+
+--- src/gtkglue.c.orig	2005-04-16 13:12:07 UTC
++++ src/gtkglue.c
+@@ -1476,8 +1476,12 @@ gsg_set_sensitivity (GSGDialog * dialog, int sensitive
+ 	  || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget)
+ 	continue;
+ 
++#ifdef SANE_CAP_ALWAYS_SETTABLE
+       if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
+ 	gtk_widget_set_sensitive (dialog->element[i].widget, sensitive);
++#else
++	gtk_widget_set_sensitive (dialog->element[i].widget, sensitive);
++#endif
+     }
+ }
+ 

Property changes on: graphics/sane-frontends/files/patch-src_gtkglue.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20191116/5b43555c/attachment.sig>