[Lunar-commits] r22601 - in moonbase/trunk: devel/sip gnome2/desktop/vte printer printer/cups printer/hpijs printer/hplip python/PyQt

Moritz Heiber moe at lunar-linux.org
Sat Dec 16 16:11:17 CET 2006


Author: moe
Date: 2006-12-16 16:11:17 +0100 (Sat, 16 Dec 2006)
New Revision: 22601

Added:
   moonbase/trunk/printer/hpijs/CONFLICTS
   moonbase/trunk/printer/hplip/
   moonbase/trunk/printer/hplip/BUILD
   moonbase/trunk/printer/hplip/CONFLICTS
   moonbase/trunk/printer/hplip/DEPENDS
   moonbase/trunk/printer/hplip/DETAILS
Modified:
   moonbase/trunk/devel/sip/DETAILS
   moonbase/trunk/gnome2/desktop/vte/BUILD
   moonbase/trunk/gnome2/desktop/vte/DETAILS
   moonbase/trunk/printer/cups/DEPENDS
   moonbase/trunk/python/PyQt/BUILD
Log:
Okay, this is a rather large update:

1) Updated PyQt to use the correct rc file.

2) Updated vte to 0.15.0 (Tested against Terminal and friends)

3) Imported hplip which is ment to replace hpijs. hplip CONTAINS hpijs
   so no functionality is lost at all. hplip is actually quite the same
   driver just with scanning/copying/network management support added.
   It also comes with a QT3 gui which requires PyQt.

4) Updated sip to 4.5.2. Confirmed to work with PyQt. The old version
   vanished from the download location.

5) Updated the cups dependency tree accordingly to use hplip instead of
   hpijs. We should remove the hpijs driver in a couple of weeks. I made the
   two drivers conflict with each other (as both provide the same files and
   the same functionality) so the upgrade should actually be a smooth one once
   you update cups (cups brings in hplip -> removes hpijs).

The SANE support of hplip is untested as I do not have a suitable HP printer
at my hands. Also, I don't know wether hplip actually compiles fine if
cups is not installed beforehand (it _should_). Tests, anyone?



Modified: moonbase/trunk/devel/sip/DETAILS
===================================================================
--- moonbase/trunk/devel/sip/DETAILS	2006-12-15 15:41:48 UTC (rev 22600)
+++ moonbase/trunk/devel/sip/DETAILS	2006-12-16 15:11:17 UTC (rev 22601)
@@ -1,11 +1,11 @@
           MODULE=sip
-         VERSION=4.5
+         VERSION=4.5.2
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://www.riverbankcomputing.com/Downloads/sip4/
-      SOURCE_VFY=sha1:873aa5e2d4ee9030d7903add7a8bf2b829e488cc
+      SOURCE_VFY=sha1:2ca7a3b61ce65dee128ac227f667fc72eb00bd5c
         WEB_SITE=http://www.riverbankcomputing.co.uk/sip/index.php
          ENTERED=20020520
-         UPDATED=20061105
+         UPDATED=20061216
            SHORT="SIP is a tool to create Python bindings for C++ libraries."
 
 cat << EOF

Modified: moonbase/trunk/gnome2/desktop/vte/BUILD
===================================================================
--- moonbase/trunk/gnome2/desktop/vte/BUILD	2006-12-15 15:41:48 UTC (rev 22600)
+++ moonbase/trunk/gnome2/desktop/vte/BUILD	2006-12-16 15:11:17 UTC (rev 22601)
@@ -1,6 +1,9 @@
 (
 
   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
+
+  OPTS+="--with-xft2 --with-pangoX --with-glX" &&
+ 
   default_build
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/gnome2/desktop/vte/DETAILS
===================================================================
--- moonbase/trunk/gnome2/desktop/vte/DETAILS	2006-12-15 15:41:48 UTC (rev 22600)
+++ moonbase/trunk/gnome2/desktop/vte/DETAILS	2006-12-16 15:11:17 UTC (rev 22601)
@@ -1,15 +1,15 @@
           MODULE=vte
-         VERSION=0.14.1
-           MAJOR=0.14
+         VERSION=0.15.0
+           MAJOR=0.15
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=vte-0.11.11-termcap.patch
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:337868f308d0eed2a16f06c3c40d5496f672dbe9
+      SOURCE_VFY=sha1:480236afdb9416e90f7aaa3c9427fd1d98bd229b
      SOURCE2_URL=$PATCH_URL/
      SOURCE2_VFY=sha1:7446b031e0f8d7fe5095c3e9022d42c52ff5c11d
         WEB_SITE=http://www.gnome.org/
          ENTERED=20021013
-         UPDATED=20061002
+         UPDATED=20061211
            SHORT="Experimental Virtual Terminal Emulator widget"
 
 cat << EOF

Modified: moonbase/trunk/printer/cups/DEPENDS
===================================================================
--- moonbase/trunk/printer/cups/DEPENDS	2006-12-15 15:41:48 UTC (rev 22600)
+++ moonbase/trunk/printer/cups/DEPENDS	2006-12-16 15:11:17 UTC (rev 22601)
@@ -3,12 +3,12 @@
 optional_depends  "espgs" \
 		  "" \
 		  "" \
-		  "For most required printer drivers" &&
+		  "for most required printer drivers" &&
 
-optional_depends  "hpijs" \
+optional_depends  "hplip" \
 		  "" \
 		  "" \
-		  "say yes if you have an HP deskjet printer" &&
+		  "for HP printer/fax/copier driver integration" &&
 
 optional_depends  "Linux-PAM" \
 		  "--enable-pam" \

Added: moonbase/trunk/printer/hpijs/CONFLICTS
===================================================================
--- moonbase/trunk/printer/hpijs/CONFLICTS	                        (rev 0)
+++ moonbase/trunk/printer/hpijs/CONFLICTS	2006-12-16 15:11:17 UTC (rev 22601)
@@ -0,0 +1 @@
+conflicts hplip

Added: moonbase/trunk/printer/hplip/BUILD
===================================================================
--- moonbase/trunk/printer/hplip/BUILD	                        (rev 0)
+++ moonbase/trunk/printer/hplip/BUILD	2006-12-16 15:11:17 UTC (rev 22601)
@@ -0,0 +1,9 @@
+(
+
+  if module_installed qt3; then
+    . /etc/profile.d/qt3.rc;
+  fi &&
+
+  default_build
+
+) > $C_FIFO 2>&1

Added: moonbase/trunk/printer/hplip/CONFLICTS
===================================================================
--- moonbase/trunk/printer/hplip/CONFLICTS	                        (rev 0)
+++ moonbase/trunk/printer/hplip/CONFLICTS	2006-12-16 15:11:17 UTC (rev 22601)
@@ -0,0 +1 @@
+conflicts hpijs

Added: moonbase/trunk/printer/hplip/DEPENDS
===================================================================
--- moonbase/trunk/printer/hplip/DEPENDS	                        (rev 0)
+++ moonbase/trunk/printer/hplip/DEPENDS	2006-12-16 15:11:17 UTC (rev 22601)
@@ -0,0 +1,12 @@
+depends  jpeg  &&
+depends  espgs &&
+
+optional_depends "PyQt" \
+                 "" \
+                 "" \
+                 "for HP gui support" &&
+
+optional_depends "net-snmp" \
+                 "--enable-network-build" \
+                 "--disable-network-build" \
+                 "for network printing support"

Added: moonbase/trunk/printer/hplip/DETAILS
===================================================================
--- moonbase/trunk/printer/hplip/DETAILS	                        (rev 0)
+++ moonbase/trunk/printer/hplip/DETAILS	2006-12-16 15:11:17 UTC (rev 22601)
@@ -0,0 +1,17 @@
+          MODULE=hplip
+         VERSION=1.6.10
+          SOURCE=$MODULE-$VERSION.tar.gz
+   SOURCE_URL=$SFORGE_URL/hplip
+      SOURCE_VFY=sha1:7c877cac132fc8695c693800c7e34322bdc8d858
+        WEB_SITE=http://hplip.sourceforge.net
+         ENTERED=20061216
+         UPDATED=20061216
+           SHORT="Hewlett Packard's drivers for HP printers."
+
+cat << EOF
+HPLIP is an HP developed solution for printing, scanning, and faxing
+with HP inkjet and laser based printers in Linux.
+The HPLIP project provides printing support for 1,040 printer models,
+including Deskjet, Officejet, Photosmart, PSC (Print Scan Copy), Business
+Inkjet, LaserJet, and LaserJet MFP.
+EOF

Modified: moonbase/trunk/python/PyQt/BUILD
===================================================================
--- moonbase/trunk/python/PyQt/BUILD	2006-12-15 15:41:48 UTC (rev 22600)
+++ moonbase/trunk/python/PyQt/BUILD	2006-12-16 15:11:17 UTC (rev 22601)
@@ -1,4 +1,6 @@
 (
+  
+  . /etc/profile.d/qt3.rc
 
   default_make                      &&
   mkdir -p         /usr/share/PyQt  &&



More information about the Lunar-commits mailing list