[Lunar-commits] r25858 - moonbase/trunk/kde3/base/kdelibs3

[Dennis Veatch]

Author: stumbles
Date: 2007-09-18 20:27:02 +0200 (Tue, 18 Sep 2007)
New Revision: 25858

Modified:
   moonbase/trunk/kde3/base/kdelibs3/BUILD
   moonbase/trunk/kde3/base/kdelibs3/DETAILS
Log:

Patches 3 and 4 fix a compile issue with cups-1.3.1 and
as with all patches, should be revisited on the next 
version bump of kdelibs and/or cups > 1.3.1.



Modified: moonbase/trunk/kde3/base/kdelibs3/BUILD
===================================================================
--- moonbase/trunk/kde3/base/kdelibs3/BUILD	2007-09-18 18:24:05 UTC (rev 25857)
+++ moonbase/trunk/kde3/base/kdelibs3/BUILD	2007-09-18 18:27:02 UTC (rev 25858)
@@ -1,10 +1,15 @@
 (
 
-patch_it $SOURCE2 0 &&
+  patch_it $SOURCE2 0 &&
+
+# These two patches need a revisit on the next kde version bump
+# or the next cups > 1.3.1  bump.
+  patch_it $SOURCE_CACHE/$SOURCE3 0 &&
+  patch_it $SOURCE_CACHE/$SOURCE4 0 &&
+
   . /etc/profile.d/qt3.rc
   . /etc/profile.d/kde3.rc
 
-
   default_config &&
 
   if [[ "$APIDOX" == "y" ]]; then

Modified: moonbase/trunk/kde3/base/kdelibs3/DETAILS
===================================================================
--- moonbase/trunk/kde3/base/kdelibs3/DETAILS	2007-09-18 18:24:05 UTC (rev 25857)
+++ moonbase/trunk/kde3/base/kdelibs3/DETAILS	2007-09-18 18:27:02 UTC (rev 25858)
@@ -2,15 +2,21 @@
          VERSION=3.5.7
           SOURCE=kdelibs-$VERSION.tar.bz2
          SOURCE2=post-3.5.7-kdelibs-kdecore.diff
+         SOURCE3=kdelibs3-cups-1.3.1-cups-util.c.patch
+         SOURCE4=kdelibs3-cups-1.3.1-ipprequest.cpp.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/kdelibs-$VERSION
       SOURCE_URL=$KDE_URL/stable/$VERSION/src/
      SOURCE2_URL=$KDE_URL/security_patches
+     SOURCE3_URL=$PATCH_URL
+     SOURCE4_URL=$PATCH_URL
       SOURCE_VFY=sha1:45f278311f20d2eb317f2175259f861c0bcf17a9
      SOURCE2_VFY=sha1:2952806f4ad8a31b82cd2795cad95b73822a663b
+     SOURCE3_VFY=sha1:d6567bcf6c35152f06e6203aa8ddbb3221a43392
+     SOURCE4_VFY=sha1:7656d5c6345256c78fabb0d0a0be0e581941935f
    MODULE_PREFIX=${KDE_PREFIX:-/opt/lunar/kde/3}
         WEB_SITE=http://www.kde.org/
          ENTERED=20020523
-         UPDATED=20070522
+         UPDATED=20070918
       MAINTAINER=florin at lunar-linux.org
            SHORT="Contain the base libraries upon which KDE is written"