Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1086ec4976f8cea4a098b17b0d85851a154ec6d3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1086ec4976f8cea4a098b17b0d85851a154ec6d3)
  • Date: Sun, 15 Nov 2009 15:07:16 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/udev/DEPENDS | 4 +++-
disk/udev/HISTORY | 1 +
graphics-libs/sane-backends/DETAILS | 1 +
graphics-libs/sane-backends/HISTORY | 5 +++++
graphics-libs/sane-backends/PRE_BUILD | 3 +++
graphics-libs/sane-backends/udev.diff | 21 +++++++++++++++++++++
6 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit c83cd9fea1a4d83c2703bb75875cabe7758bc847
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

udev - extra depends gobject-introspection & consolekit

commit b2a03cd8382d6adc60797666baf64d50dc2faef2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sane-backends - fix generated udev rules

diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index ae20811..46f9a68 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -9,7 +9,9 @@ if list_find "$UDEV_OPTS" "--enable-extras"; then
depends libusb &&
depends usbutils &&
depends USBIDS &&
- depends PCIIDS
+ depends PCIIDS &&
+ optional_depends consolekit '' '' 'seesion/seat support' &&
+ optional_depends gobject-introspection '' '--disable-introspection'
'GObject introspection support'
fi &&

if [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'pciutils' ]]; then
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index fe2e0a7..7d9e4ac 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -2,6 +2,7 @@
* DETAILS: version 147
* libusb.diff: deleted
* PRE_BUILD: don't applu libusb.diff
+ * DEPENDS: add optional gobject-introspection

2009-10-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* SUB_DEPENDS: remove --disable-extras from UDEV_OPTS if
diff --git a/graphics-libs/sane-backends/DETAILS
b/graphics-libs/sane-backends/DETAILS
index 9c857af..d51e77a 100755
--- a/graphics-libs/sane-backends/DETAILS
+++ b/graphics-libs/sane-backends/DETAILS
@@ -1,6 +1,7 @@
SPELL=sane-backends
VERSION=1.0.20

SOURCE_HASH=sha512:0edaea74753912f8466d9ef00228d306ec9b4d754ca48717f7fd4b61f99bee7a7c9c2a1abfb461f07859bc780f67fe2c969615359c2e388bc6c8ad3e4b339859
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.sane-project.org/pub/sane/$SPELL-$VERSION/$SOURCE
diff --git a/graphics-libs/sane-backends/HISTORY
b/graphics-libs/sane-backends/HISTORY
index a9c5ba3..5abc3bc 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,8 @@
+2009-11-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD, udev.diff: added
+ fix rule for latest udev
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: switch from tetex to texlive [auto]

diff --git a/graphics-libs/sane-backends/PRE_BUILD
b/graphics-libs/sane-backends/PRE_BUILD
new file mode 100755
index 0000000..23b402a
--- /dev/null
+++ b/graphics-libs/sane-backends/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/udev.diff
diff --git a/graphics-libs/sane-backends/udev.diff
b/graphics-libs/sane-backends/udev.diff
new file mode 100644
index 0000000..6ad57a0
--- /dev/null
+++ b/graphics-libs/sane-backends/udev.diff
@@ -0,0 +1,21 @@
+diff -uNr sane-backends-1.0.20/tools/sane-desc.c
sane-backends-1.0.20.cp/tools/sane-desc.c
+--- sane-backends-1.0.20/tools/sane-desc.c 2009-04-15 03:47:56.000000000
+0200
++++ sane-backends-1.0.20.cp/tools/sane-desc.c 2009-11-15 21:13:35.000000000
+0100
+@@ -3488,7 +3488,7 @@
+ printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
+ printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
+ printf ("# Generic: SCSI device type 6 indicates a scanner\n");
+- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\",
MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
++ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\",
GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
+ printf ("# Some scanners advertise themselves as SCSI device type 3\n");
+
+ while (scsiid)
+@@ -3521,7 +3521,7 @@
+ }
+ }
+ printf ("\n");
+- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\",
ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
++ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\",
ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
+ scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE,
DEVGROUP);
+ scsiid = scsiid->next;
+ }



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1086ec4976f8cea4a098b17b0d85851a154ec6d3), Treeve Jelbert, 11/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page