Author: sip Date: 2006-05-16 17:43:12 +0200 (Tue, 16 May 2006) New Revision: 1409 Added: crux-2.2/ports/opt/kdelibs/kdelibs-3.5.2-cups-1.2.patch Modified: crux-2.2/ports/opt/kdelibs/.md5sum crux-2.2/ports/opt/kdelibs/Pkgfile Log: kdelibs: added patch for cups 1.2 (thanks to Torsten Henschel) Modified: crux-2.2/ports/opt/kdelibs/.md5sum =================================================================== --- crux-2.2/ports/opt/kdelibs/.md5sum 2006-05-16 14:14:21 UTC (rev 1408) +++ crux-2.2/ports/opt/kdelibs/.md5sum 2006-05-16 15:43:12 UTC (rev 1409) @@ -1,2 +1,3 @@ d5fcdb478e741831e6ce992f670eba1e 10888-bt.tar.gz +83c8c90024634c0de273d45518caac4e kdelibs-3.5.2-cups-1.2.patch 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 Modified: crux-2.2/ports/opt/kdelibs/Pkgfile =================================================================== --- crux-2.2/ports/opt/kdelibs/Pkgfile 2006-05-16 14:14:21 UTC (rev 1408) +++ crux-2.2/ports/opt/kdelibs/Pkgfile 2006-05-16 15:43:12 UTC (rev 1409) @@ -6,12 +6,14 @@ name=kdelibs version=3.5.2 -release=3 +release=4 source=(http://download.kde.org/stable/3.5.2/src/$name-$version.tar.bz2 \ - http://www.kde-look.org/content/files/10888-bt.tar.gz) + http://www.kde-look.org/content/files/10888-bt.tar.gz \ + $name-$version-cups-1.2.patch) build() { cd $name-$version + patch -d kdeprint/cups < ../$name-$version-cups-1.2.patch ./configure --prefix=/usr \ --with-distribution="CRUX" \ --enable-sendfile \ Added: crux-2.2/ports/opt/kdelibs/kdelibs-3.5.2-cups-1.2.patch =================================================================== --- crux-2.2/ports/opt/kdelibs/kdelibs-3.5.2-cups-1.2.patch (rev 0) +++ crux-2.2/ports/opt/kdelibs/kdelibs-3.5.2-cups-1.2.patch 2006-05-16 15:43:12 UTC (rev 1409) @@ -0,0 +1,20 @@ +--- ipprequest.cpp.orig 2005-10-10 17:06:30.000000000 +0200 ++++ ipprequest.cpp 2006-05-14 21:32:00.000000000 +0200 +@@ -511,6 +511,11 @@ + cupsFreeOptions(n, options); + + // find an remove that annoying "document-format" attribute ++ #if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 ++ ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME); ++ ippDeleteAttribute(request_, attr); ++ #else ++ // (can't use IppDeleteAttribute as older cups doesn't have that) + ipp_attribute_t *attr = request_->attrs; + while (attr) + { +@@ -523,4 +528,5 @@ + } + attr = attr->next; + } ++ #endif + }