rev 7118 - in trunk/packages/kdelibs/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Thu Aug 23 05:29:19 UTC 2007
Author: ana
Date: 2007-08-23 05:29:19 +0000 (Thu, 23 Aug 2007)
New Revision: 7118
Added:
trunk/packages/kdelibs/debian/patches/48_cups13.diff
trunk/packages/kdelibs/debian/patches/49_hurd_support.diff
Modified:
trunk/packages/kdelibs/debian/changelog
Log:
* Add patch 48_cups13.diff to build against new CUPS 1.3.0.
Patch by Tim Waugh. (Closes: #438558)
* Add patch 48_hurd_support.diff to fix FTBFS on hurd-i386.
Patch by Samuel Thibault. (Closes: #438952)
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2007-08-22 14:43:27 UTC (rev 7117)
+++ trunk/packages/kdelibs/debian/changelog 2007-08-23 05:29:19 UTC (rev 7118)
@@ -1,12 +1,21 @@
kdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
+ +++ Changes by Ana Beatriz Guerrero Lopez:
+
+ * Add patch 48_cups13.diff to build against new CUPS 1.3.0.
+ Patch by Tim Waugh. (Closes: #438558)
+ * Add patch 48_hurd_support.diff to fix FTBFS on hurd-i386.
+ Patch by Samuel Thibault. (Closes: #438952)
+
+ +++ Changes by Fathi Boudra:
+
* Move binaries to kdelibs4-dev: kconfig_compiler, ksvgtopng,
kunittestmodrunner, makekdewidgets, preparetips.
Allow kdelibs5-dev co-installable alongside kdelibs4c2a.
* Suggests perl-suid instead Recommends. (Closes: #437414)
- -- Debian Qt/KDE Maintainers Sun, 12 Aug 2007 16:57:37 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 23 Aug 2007 07:24:52 +0200
kdelibs (4:3.5.7.dfsg.1-4) unstable; urgency=low
Added: trunk/packages/kdelibs/debian/patches/48_cups13.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/48_cups13.diff (rev 0)
+++ trunk/packages/kdelibs/debian/patches/48_cups13.diff 2007-08-23 05:29:19 UTC (rev 7118)
@@ -0,0 +1,82 @@
+--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13 2006-10-01 12:33:43.000000000 -0500
++++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c 2007-07-19 15:12:48.000000000 -0500
+@@ -108,7 +108,8 @@ cupsGetConf(void)
+ * See if we should retry the current digest password...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0 ||
+ digest_tries > 1 || !pwdstring[0])
+ {
+ /*
+@@ -116,7 +117,7 @@ cupsGetConf(void)
+ */
+
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+- cups_server->hostname);
++ cupsServer());
+
+ if ((password = cupsGetPassword(prompt)) == NULL)
+ break;
+@@ -135,7 +136,8 @@ cupsGetConf(void)
+ * Got a password; encode it for the server...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0)
+ {
+ /*
+ * Basic authentication...
+@@ -334,7 +336,8 @@ cupsPutConf(const char *name) /* I - Na
+ * See if we should retry the current digest password...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0 ||
+ digest_tries > 1 || !pwdstring[0])
+ {
+ /*
+@@ -342,7 +345,7 @@ cupsPutConf(const char *name) /* I - Na
+ */
+
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+- cups_server->hostname);
++ cupsServer());
+
+ if ((password = cupsGetPassword(prompt)) == NULL)
+ break;
+@@ -361,7 +364,8 @@ cupsPutConf(const char *name) /* I - Na
+ * Got a password; encode it for the server...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0)
+ {
+ /*
+ * Basic authentication...
+--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13 2007-01-15 05:34:19.000000000 -0600
++++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp 2007-07-19 15:15:09.000000000 -0500
+@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt
+ return false;
+ }
+
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
+ #endif
+
+@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt
+ }
+
+ request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ cups_authstring = HTTP->authstring;
+ #endif
+ httpClose(HTTP);
\ No newline at end of file
Added: trunk/packages/kdelibs/debian/patches/49_hurd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/49_hurd_support.diff (rev 0)
+++ trunk/packages/kdelibs/debian/patches/49_hurd_support.diff 2007-08-23 05:29:19 UTC (rev 7118)
@@ -0,0 +1,134 @@
+--- kdelibs-3.5.7.dfsg.1/kio/kio/kurlcompletion.cpp.orig 2007-08-21 01:20:27.125594000 +0200
++++ kdelibs-3.5.7.dfsg.1/kio/kio/kurlcompletion.cpp 2007-08-21 01:28:02.002981000 +0200
+@@ -231,6 +231,9 @@
+ while ( !terminationRequested() &&
+ (dirEntry = ::readdir( dir)))
+ #else
++#if !defined(MAXPATHLEN) && defined(__GNU__)
++#define MAXPATHLEN UCHAR_MAX
++#endif
+ struct dirent *dirPosition = (struct dirent *) malloc( sizeof( struct dirent ) + MAXPATHLEN + 1 );
+ struct dirent *dirEntry = 0;
+ while ( !terminationRequested() &&
+--- kdelibs-3.5.7.dfsg.1/kdoctools/meinproc.cpp.orig 2007-08-21 01:40:47.688059000 +0200
++++ kdelibs-3.5.7.dfsg.1/kdoctools/meinproc.cpp 2007-08-21 01:46:17.833610000 +0200
+@@ -136,9 +136,18 @@
+ }
+
+ if ( args->isSet( "check" ) ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++ char *pwd_buffer;
++#else
+ char pwd_buffer[PATH_MAX];
++#endif
+ QFileInfo file( QFile::decodeName(args->arg( 0 )) );
+- if ( !getcwd( pwd_buffer, sizeof(pwd_buffer) - 1 ) ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++ if ( !(pwd_buffer = getcwd( NULL, 0 ) ) )
++#else
++ if ( !getcwd( pwd_buffer, sizeof(pwd_buffer) - 1 ) )
++#endif
++ {
+ kdError() << "getcwd failed." << endl;
+ return 2;
+ }
+@@ -175,11 +184,18 @@
+ }
+ pclose( xmllint );
+ chdir( pwd_buffer );
+- if ( !noout )
++ if ( !noout ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++ free( pwd_buffer );
++#endif
+ return 1;
++ }
+ } else {
+ kdWarning() << "couldn't find xmllint" << endl;
+ }
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++ free( pwd_buffer );
++#endif
+ }
+
+ xmlSubstituteEntitiesDefault(1);
+--- kdelibs-3.5.7.dfsg.1/kioslave/file/file.cc.orig 2007-08-21 01:51:36.702504000 +0200
++++ kdelibs-3.5.7.dfsg.1/kioslave/file/file.cc 2007-08-21 01:55:39.362966000 +0200
+@@ -1234,8 +1234,13 @@
+ directories we keep as active directory. And
+ as the slave runs in the background, it's hard
+ to see for the user what the problem would be */
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++ char *path_buffer;
++ path_buffer = getcwd(NULL, 0);
++#else
+ char path_buffer[PATH_MAX];
+ (void) getcwd(path_buffer, PATH_MAX - 1);
++#endif
+ if ( chdir( _path.data() ) ) {
+ if (errno == EACCES)
+ error(ERR_ACCESS_DENIED, _path);
+@@ -1261,6 +1266,9 @@
+ kdDebug(7101) << "============= COMPLETED LIST ============" << endl;
+
+ chdir(path_buffer);
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++ free(path_buffer);
++#endif
+
+ finished();
+ }
+--- kdelibs-3.5.7.dfsg.1/libkmid/fmout.cc.orig 2007-08-21 02:05:03.032474000 +0200
++++ kdelibs-3.5.7.dfsg.1/libkmid/fmout.cc 2007-08-21 02:08:08.281128000 +0200
+@@ -127,8 +127,8 @@
+ void FMOut::loadFMPatches(void)
+ {
+ #ifdef HAVE_OSS_SUPPORT
+- char patchesfile[PATH_MAX];
+- char drumsfile[PATH_MAX];
++ char patchesfile[strlen(FMPatchesDirectory)+7+1];
++ char drumsfile[strlen(FMPatchesDirectory)+9+1];
+ int size;
+ struct sbi_instrument instr;
+ char tmp[60];
+@@ -141,12 +141,12 @@
+
+ if (opl==3)
+ {
+- snprintf(patchesfile, PATH_MAX, "%s/std.o3",FMPatchesDirectory);
++ snprintf(patchesfile, sizeof(patchesfile), "%s/std.o3",FMPatchesDirectory);
+ size=60;
+ }
+ else
+ {
+- snprintf(patchesfile, PATH_MAX, "%s/std.sb",FMPatchesDirectory);
++ snprintf(patchesfile, sizeof(patchesfile), "%s/std.sb",FMPatchesDirectory);
+ size=52;
+ }
+ fh=fopen(patchesfile,"rb");
+@@ -171,11 +171,11 @@
+
+ if (opl==3)
+ {
+- snprintf(drumsfile, PATH_MAX, "%s/drums.o3",FMPatchesDirectory);
++ snprintf(drumsfile, sizeof(drumsfile), "%s/drums.o3",FMPatchesDirectory);
+ }
+ else
+ {
+- snprintf(drumsfile, PATH_MAX, "%s/drums.sb",FMPatchesDirectory);
++ snprintf(drumsfile, sizeof(drumsfile), "%s/drums.sb",FMPatchesDirectory);
+ }
+
+ fh=fopen(drumsfile,"rb");
+--- kdelibs-3.5.7.dfsg.1/kinit/lnusertemp.c.orig 2007-08-21 02:16:31.074726000 +0200
++++ kdelibs-3.5.7.dfsg.1/kinit/lnusertemp.c 2007-08-21 02:17:13.037686000 +0200
+@@ -89,6 +89,9 @@
+ }
+
+
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
+ int build_link(const char *tmp_prefix, const char *kde_prefix)
+ {
+ struct passwd *pw_ent;
More information about the pkg-kde-commits
mailing list