[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2085: two function deprecations: xmlParserInputRead (3725), httpConnect (3724)

[Mats Wichmann]

------------------------------------------------------------
revno: 2085
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2013-03-01 09:23:48 -0700
message:
  two function deprecations: xmlParserInputRead (3725), httpConnect (3724)
modified:
  headers/cups/http.h
  headers/libxml2/libxml/parser.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/cups/http.h'
--- a/headers/cups/http.h	2012-05-29 16:42:13 +0000
+++ b/headers/cups/http.h	2013-03-01 16:23:48 +0000
@@ -11,6 +11,14 @@
 #include <stdint.h>
 #include <cups/cups.h>
 
+#if !defined(LSB_DECL_DEPRECATED)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))
+#define LSB_DECL_DEPRECATED __attribute__ ((__deprecated__))
+#else
+#define LSB_DECL_DEPRECATED
+#endif
+#endif				/* LSB_DECL_DEPRECATED */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -114,7 +122,13 @@
     extern void httpClearCookie(http_t * http);
     extern void httpClearFields(http_t * http);
     extern void httpClose(http_t * http);
-    extern http_t *httpConnect(const char *host, int port);
+    /* This function is deprecated. Use
+       httpConnectEncrypt instead */
+    extern http_t *httpConnect(const char *host, int port)
+#if __LSB_VERSION__ >= 50
+     LSB_DECL_DEPRECATED
+#endif				/* __LSB_VERSION__ >= 50 */
+    ;
     extern http_t *httpConnectEncrypt(const char *host, int port,
 				      http_encryption_t encryption);
     extern char *httpDecode64_2(char *out, int *outlen, const char *in);

=== modified file 'headers/libxml2/libxml/parser.h'
--- a/headers/libxml2/libxml/parser.h	2010-12-08 14:03:49 +0000
+++ b/headers/libxml2/libxml/parser.h	2013-03-01 16:23:48 +0000
@@ -13,6 +13,14 @@
 #include <libxml2/libxml/SAX2.h>
 #include <libxml2/libxml/xmlIO.h>
 
+#if !defined(LSB_DECL_DEPRECATED)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))
+#define LSB_DECL_DEPRECATED __attribute__ ((__deprecated__))
+#else
+#define LSB_DECL_DEPRECATED
+#endif
+#endif				/* LSB_DECL_DEPRECATED */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -199,7 +207,13 @@
 							const xmlNodePtr
 							node);
     extern int xmlParserInputGrow(xmlParserInputPtr in, int len);
-    extern int xmlParserInputRead(xmlParserInputPtr in, int len);
+    /* This function was internal
+       and is now marked as deprecated; it always returns an error. */
+    extern int xmlParserInputRead(xmlParserInputPtr in, int len)
+#if __LSB_VERSION__ >= 50
+     LSB_DECL_DEPRECATED
+#endif				/* __LSB_VERSION__ >= 50 */
+    ;
     extern int xmlPedanticParserDefault(int val);
     extern xmlDocPtr xmlReadDoc(const xmlChar * cur, const char *URL,
 				const char *encoding, int options);

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-02-28 18:55:06 +0000
+++ b/package/Makefile	2013-03-01 16:23:48 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=1
+RPM_PACKAGE_RELEASE=2
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)