[SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (c7f4835640bd4024f403fc7bffb5e0f87287e0db)

Treeve Jelbert scm at sourcemage.org
Sun Oct 11 11:02:23 EDT 2009


GIT changes to devel-xorg-modular grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 disk/udev/DETAILS                 |    2 +-
 disk/udev/HISTORY                 |    7 +++++++
 disk/udev/PRE_BUILD               |    2 ++
 disk/udev/libusb.diff             |   14 ++++++++++++++
 kde4/kdebase-workspace4/DEPENDS   |    3 +++
 kde4/kdebase-workspace4/HISTORY   |    4 ++++
 printer/cups/70-cups-libusb.rules |    9 +++++++++
 printer/cups/DETAILS              |    1 +
 printer/cups/HISTORY              |    6 ++++++
 printer/cups/INSTALL              |    6 ++++++
 xorg-app/iceauth/DETAILS          |    5 ++---
 xorg-app/iceauth/HISTORY          |    3 +++
 xorg-app/mkfontdir/DETAILS        |    5 ++---
 xorg-app/mkfontdir/HISTORY        |    3 +++
 xorg-app/mkfontscale/DETAILS      |    5 ++---
 xorg-app/mkfontscale/HISTORY      |    3 +++
 16 files changed, 68 insertions(+), 10 deletions(-)

New commits:
commit c7f4835640bd4024f403fc7bffb5e0f87287e0db
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    mkfontdir: => 1.0.5

commit 1765dfebfce7b2402f146ee965d6860529111d4d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    mkfontscale: => 1.0.7

commit 4768ad5fc3a6f92b64c596d665fd3fb1c9f877ce
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    iceauth: => 1.0.3

commit d745df275f245374d9423bc8c5fb610ad6770b02
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    udev -fix problem with usb printers and libusb

commit 9611b01ee2b4b5d9bcb549f77337486474abe268
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    cups -fix problem with usb printers and libusb

commit 24b6e10c41ae3ea78c89ff8ca6c82613f8f4234a
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdebase-workspace4 - fix bug #15462

diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 6a8b804..c3ae472 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,6 +1,6 @@
            SPELL=udev
          VERSION=146
-      PATCHLEVEL=1
+      PATCHLEVEL=2
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index f95f22b..fd99f08 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,10 @@
+2009-10-11 Treeve Jelbert <treeve at sourcemage.org>
+	* libusb.diff: added
+	  upstream patch for printing with libusb/cups
+
+	* PRE_BUILD: apply patch
+	* DETAILS: PATCHLEVEL++
+
 2009-09-29 Finn Haedicke <finn_haedicke at gmx.net>
 	* DEPENDS: udev extras require usbutils
 
diff --git a/disk/udev/PRE_BUILD b/disk/udev/PRE_BUILD
index 7a4278e..a8f2fa9 100755
--- a/disk/udev/PRE_BUILD
+++ b/disk/udev/PRE_BUILD
@@ -15,5 +15,7 @@ else
   default_pre_build &&
   cd "$SOURCE_DIRECTORY"
 fi &&
+# temporary patch for lib/usb/cups
+patch -p1 < $SPELL_DIRECTORY/libusb.diff &&
 
 sed -i "s:install-dist_udevconfDATA::g" Makefile.in
diff --git a/disk/udev/libusb.diff b/disk/udev/libusb.diff
new file mode 100644
index 0000000..4d671cd
--- /dev/null
+++ b/disk/udev/libusb.diff
@@ -0,0 +1,14 @@
+diff -ur udev-146/rules/rules.d/50-udev-default.rules udev-146.cp/rules/rules.d/50-udev-default.rules
+--- udev-146/rules/rules.d/50-udev-default.rules	2009-08-08 15:42:05.000000000 +0200
++++ udev-146.cp/rules/rules.d/50-udev-default.rules	2009-10-11 15:06:54.000000000 +0200
+@@ -60,6 +60,10 @@
+ SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
+ KERNEL=="lp[0-9]*",		GROUP="lp"
+ KERNEL=="irlpt[0-9]*",		GROUP="lp"
++# hplip and cups 1.4+ use raw USB devices, so permissions should be similar to
++# the ones from the old usblp kernel module
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701*:", GROUP="lp", MODE="660"
+ 
+ # block
+ SUBSYSTEM=="block", GROUP="disk"
diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
index c1b56e8..3a01e7b 100755
--- a/kde4/kdebase-workspace4/DEPENDS
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -1,5 +1,8 @@
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 depends  kdepimlibs4   &&
+if [[ "${KDE_VER}" == "stable" ]];then
+  depends kdelibs4-experimental
+fi &&
 depends  xproto        &&
 depends  xextproto     &&
 depends  xmessage      &&
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 6895d81..ad7d2bf 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,7 @@
+2009-10-11 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: stable version needs kdelibs4-experimental
+	  fixes bug #15462
+  
 2009-10-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.3.2 (stable)
 
diff --git a/printer/cups/70-cups-libusb.rules b/printer/cups/70-cups-libusb.rules
new file mode 100644
index 0000000..43f17ef
--- /dev/null
+++ b/printer/cups/70-cups-libusb.rules
@@ -0,0 +1,9 @@
+# Allow the lp group to read and write raw USB devices for printers.
+ # This is required for the CUPS usb backend when built with libusb
+ # support.
+ ACTION=="add", SUBSYSTEM=="usb", \
+ ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", \
+ DEVTYPE="usb_device", RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"
+ 
+ 
+
diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index b838989..b5a032b 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -7,6 +7,7 @@ else
      SOURCE_HASH=sha512:b1a389e59c757d71800ce28c74ae1be3017be8b1cb38e84ff431715660d3bad46a40c55954bd623a5d5a4ac37826e11a4957d53f421c78ab76ce13789a557d84
   SECURITY_PATCH=3
 fi
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION-source.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 2287cce..131ed03 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,9 @@
+2009-10-11 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* INSTALL, cups/70-cups-libusb.rules: added
+	  fix from fedora so that can print to usb printers using libusb
+	  the user must be a member of the lp group
+
 2009-09-13 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.1
 
diff --git a/printer/cups/INSTALL b/printer/cups/INSTALL
new file mode 100755
index 0000000..d5323a9
--- /dev/null
+++ b/printer/cups/INSTALL
@@ -0,0 +1,6 @@
+default_install &&
+if spell_installed udev && spell_installed libusb;then
+  message any user of usb printers must belong to the lp group \
+          you may also need to remove the usblp module
+  cp $SPELL_DIRECTORY/70-cups-libusb.rules $INSTALL_ROOT/etc/udev/rules.d/
+fi
diff --git a/xorg-app/iceauth/DETAILS b/xorg-app/iceauth/DETAILS
index 9e1dad2..b234e43 100755
--- a/xorg-app/iceauth/DETAILS
+++ b/xorg-app/iceauth/DETAILS
@@ -1,10 +1,9 @@
            SPELL=iceauth
              PKG=iceauth
-         VERSION=1.0.2
-        XORG_VER=X11R7.0
+         VERSION=1.0.3
+     SOURCE_HASH=sha512:6c9c4ef3ee5d85e9049dca43a83e921ff0e79e0f412b28a35271c1fd2b36a5c5de4f11a242fe477717142d3829037e5c944428c25373d59fa0db655e44a1e274
           SOURCE=${PKG}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-     SOURCE_HASH=sha512:c838d242741a79358ea3d780249d7fdc2476805ed809674bd59c2b8c01a7fbf0e2fd69badabd12dc09dbb932885a41f77df03831c610b09fa1f28495a02bc115
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
diff --git a/xorg-app/iceauth/HISTORY b/xorg-app/iceauth/HISTORY
index 612626a..9bdb29a 100644
--- a/xorg-app/iceauth/HISTORY
+++ b/xorg-app/iceauth/HISTORY
@@ -1,3 +1,6 @@
+2009-10-11  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.3
+
 2008-03-17 Eric Sandall <sandalle at sourcemage.org>
 	* CONFLICTS: Auto-conflicts with xorg as well
 
diff --git a/xorg-app/mkfontdir/DETAILS b/xorg-app/mkfontdir/DETAILS
index da1fc69..48f1e41 100755
--- a/xorg-app/mkfontdir/DETAILS
+++ b/xorg-app/mkfontdir/DETAILS
@@ -1,10 +1,9 @@
            SPELL=mkfontdir
              PKG=mkfontdir
-         VERSION=1.0.4
-        XORG_VER=X11R7.1
+         VERSION=1.0.5
+     SOURCE_HASH=sha512:a81152179f9f60936cb9826cd8a85f4c920bb8d5e4ffa277593f36f65712cedb734cb8f59295ae1a13542662d8c499f5388cd34245938d1104ad10081c0aa8d7
           SOURCE=${PKG}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-     SOURCE_HASH=sha512:b903493238acd324e6453e236c915fcab1dd2b18d98a56c9566fb80073bc1835be056ffa94df648b4f48ca4652fa1d518b268db51c11c7c9bb126c75c0c6c122
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org/wiki
          ENTERED=20051125
diff --git a/xorg-app/mkfontdir/HISTORY b/xorg-app/mkfontdir/HISTORY
index b63d46a..8a873f9 100644
--- a/xorg-app/mkfontdir/HISTORY
+++ b/xorg-app/mkfontdir/HISTORY
@@ -1,3 +1,6 @@
+2009-10-11  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.5
+
 2008-03-20 Andraž ruskie Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated spell to 1.0.4
 	  fixed WEB_SITE
diff --git a/xorg-app/mkfontscale/DETAILS b/xorg-app/mkfontscale/DETAILS
index f9ebb1a..733d59b 100755
--- a/xorg-app/mkfontscale/DETAILS
+++ b/xorg-app/mkfontscale/DETAILS
@@ -1,10 +1,9 @@
            SPELL=mkfontscale
              PKG=mkfontscale
-         VERSION=1.0.6
-        XORG_VER=X11R7.0
+         VERSION=1.0.7
+     SOURCE_HASH=sha512:1b8443feb9b94a700ab6f4ce4106975e554cdd5112c643c4fda99ecf461625854c4b9e29eb25a0004d54d9309f820ec12ae51ffc282e37fd3931872d5e06a8a4
           SOURCE=${PKG}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-     SOURCE_HASH=sha512:3c4c6c596061681c0afbbe8f27bf2c25392e082a83ab4139fc9ae5e9b120d44f2de72c341de07ab17af7e741d342becc659d65bbbddbda7a0d2bc602eadd57b7
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org/wiki
          ENTERED=20051125
diff --git a/xorg-app/mkfontscale/HISTORY b/xorg-app/mkfontscale/HISTORY
index dbf1776..71a05de 100644
--- a/xorg-app/mkfontscale/HISTORY
+++ b/xorg-app/mkfontscale/HISTORY
@@ -1,3 +1,6 @@
+2009-10-11 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.7
+
 2009-01-25 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated spell to 1.0.6
 



More information about the SM-Commit mailing list