Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/ed/PKGBUILD
	extra/qt/PKGBUILD

3 files changed, 421 insertions, 21 deletions

diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 03ef8945d..ec302f134 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 166387 2012-09-07 13:33:10Z andyrtr $
+# $Id: PKGBUILD 172123 2012-11-29 18:28:53Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.24
+pkgver=1.0.25
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
-depends=('lcms2' 'poppler>=0.20.3' 'qpdf')
+depends=('lcms2' 'poppler>=0.20.5' 'qpdf')
 makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
@@ -17,7 +17,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
 backup=(etc/fonts/conf.d/99pdftoopvp.conf)
 options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-md5sums=('242ea48cd41f8546d71b00bf2b06c564')
+md5sums=('9690028c5e312b086e7572ae1899a33c')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 4e5d829a2..aea37615e 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
+# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
+# Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.12.6
-pkgrel=3
+pkgver=3.12.11
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
 license=('GPL')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-	 'net-snmp>=5.7.1')
+	 'net-snmp>=5.7.1' 'wget')
 makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
 optdepends=('cups: for printing support'
             'python2-dbus: for dbus support'
             'sane: for scanner support'
-            'python-imaging: for commandline scanning support'
-            'python-notify: for Desktop notification support'
+            'python2-imaging: for commandline scanning support'
+            'python2-notify: for Desktop notification support'
             'rpcbind: for network support'
             'python2-pyqt: for running hp-toolbox'
             'python2-gobject2: for running hp-toolbox'
@@ -29,16 +29,19 @@ conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('5303938e8630775ea6fb383af85775e5'
-         'b562457e4c713d8609b3d6dd2be10baf')
+source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
+        cups-1.6-buildfix.diff)
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
+
+ # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
+ patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff"
+ 
  export PYTHON=python2
  
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
  sed -i 's|python ./print.py|python2 ./print.py|' scan.py
  sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
@@ -46,7 +49,9 @@ build() {
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
  
-
+ # fix rc script path - FS#31921
+ sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py
+ 
  # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
  # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
  # The hpcups driver does not use foomatic-rip
@@ -78,13 +83,16 @@ build() {
 }
 
 package() {
- cd "$srcdir/$_pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ #cd "$srcdir/$_pkgname-$pkgver"
+ cd "$srcdir/$_pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
  # remove config provided by sane and autostart of hp-daemon
  rm -rf "$pkgdir"/etc/{sane.d,xdg}
  # remove HAL .fdi file because HAL is no longer used
  rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
 }
+md5sums=('6caadc4a9e49076c284b146e2dce2937'
+         '835d3b854d097f229a32291338fa2320'
+         'ef64578c6cb3ce252dbdcb0f1c2f4a47')
diff --git a/libre/hplip-libre/cups-1.6-buildfix.diff b/libre/hplip-libre/cups-1.6-buildfix.diff
new file mode 100644
index 000000000..8341a1610
--- /dev/null
+++ b/libre/hplip-libre/cups-1.6-buildfix.diff
@@ -0,0 +1,392 @@
+diff -up hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors hplip-3.12.6/prnt/cupsext/cupsext.c
+--- hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors	2012-06-18 12:41:19.000000000 +0200
++++ hplip-3.12.6/prnt/cupsext/cupsext.c	2012-07-19 17:11:47.606524137 +0200
+@@ -87,6 +87,46 @@ typedef int Py_ssize_t;
+ #define PY_SSIZE_T_MIN INT_MIN
+ #endif
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr)     attr->num_values
++#define ippGetGroupTag(attr)  attr->group_tag
++#define ippGetValueTag(attr)  attr->value_tag
++#define ippGetName(attr)      attr->name
++#define ippGetBoolean(attr, element) attr->values[element].boolean
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetStatusCode(ipp) ipp->request.status.status_code
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
++{
++    if (!ipp)
++        return (NULL);
++    return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
++{
++    if (!ipp || !ipp->current)
++        return (NULL);
++    return (ipp->current = ipp->current->next);
++}
++
++static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
++{
++    ipp->request.op.operation_id = op;
++    return (1);
++}
++
++static int ippSetRequestId( ipp_t *ipp, int request_id )
++{
++    ipp->request.any.request_id = request_id;
++    return (1);
++}
++#endif
+ 
+ int g_num_options = 0;
+ cups_option_t * g_options;
+@@ -333,8 +373,8 @@ PyObject * getPrinters( PyObject * self,
+     request = ippNew();
+     language = cupsLangDefault();
+ 
+-    request->request.op.operation_id = CUPS_GET_PRINTERS;
+-    request->request.any.request_id = 1;
++    ippSetOperation( request, CUPS_GET_PRINTERS );
++    ippSetRequestId ( request, 1);
+ 
+     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -378,10 +418,10 @@ PyObject * getPrinters( PyObject * self,
+         ipp_pstate_t state;
+         int i = 0;
+ 
+-        for ( attr = response->attrs; attr != NULL; attr = attr->next )
++        for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) )
+         {
+-            while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
+-                attr = attr->next;
++            while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER )
++                attr = ippNextAttribute( response );
+ 
+             if ( attr == NULL )
+                 break;
+@@ -390,41 +430,41 @@ PyObject * getPrinters( PyObject * self,
+             state = IPP_PRINTER_IDLE;
+             accepting = 0;
+ 
+-            while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
++            while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER )
+             {
+-                if ( strcmp( attr->name, "printer-name" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_NAME )
+-                    name = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "device-uri" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_URI )
+-                    device_uri = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_URI )
+-                    printer_uri = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-info" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    info = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-location" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    location = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    make_model = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-state" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_ENUM )
+-                    state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
+-
+-                else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
+-                        attr->value_tag == IPP_TAG_BOOLEAN)
+-                    accepting = attr->values[ 0 ].boolean;
++                if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_NAME )
++                    name = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_URI )
++                    device_uri = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_URI )
++                    printer_uri = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
++                    info = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
++                    location = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
++                    make_model = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_ENUM )
++                    state = ( ipp_pstate_t ) ippGetInteger( attr, 0 );
++
++                else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") &&
++                        ippGetValueTag( attr ) == IPP_TAG_BOOLEAN)
++                    accepting = ippGetBoolean( attr, 0 );
+ 
+-                attr = attr->next;
++                attr = ippNextAttribute( response );
+             }
+ 
+             if ( device_uri == NULL )
+@@ -522,8 +562,8 @@ PyObject * addPrinter( PyObject * self,
+     request = ippNew();
+     language = cupsLangDefault();
+ 
+-    request->request.op.operation_id = CUPS_ADD_PRINTER;
+-    request->request.any.request_id = 1;
++    ippSetOperation( request, CUPS_ADD_PRINTER );
++    ippSetRequestId ( request, 1 );
+ 
+     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -568,7 +608,7 @@ PyObject * addPrinter( PyObject * self,
+     }
+     else
+     {
+-        status = response->request.status.status_code;
++        status = ippGetStatusCode( response );
+         //ippDelete( response );
+         r = 1;
+     }
+@@ -631,8 +671,8 @@ PyObject * delPrinter( PyObject * self,
+        */
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_DELETE_PRINTER;
+-    request->request.op.request_id = 1;
++    ippSetOperation( request, CUPS_DELETE_PRINTER );
++    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -650,7 +690,7 @@ PyObject * delPrinter( PyObject * self,
+      */
+     response = cupsDoRequest( http, request, "/admin/" );
+ 
+-    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
++    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+     {
+         r = 1;
+     }
+@@ -721,8 +761,8 @@ PyObject * setDefaultPrinter( PyObject *
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_SET_DEFAULT;
+-    request->request.op.request_id = 1;
++    ippSetOperation( request, CUPS_SET_DEFAULT );
++    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -743,7 +783,7 @@ PyObject * setDefaultPrinter( PyObject *
+ 
+     response = cupsDoRequest( http, request, "/admin/" );
+ 
+-    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
++    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+     {
+         r = 1;
+     }
+@@ -797,8 +837,8 @@ PyObject * controlPrinter( PyObject * se
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = op;
+-    request->request.op.request_id = 1;
++    ippSetOperation( request, op );
++    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -822,7 +862,7 @@ PyObject * controlPrinter( PyObject * se
+ 
+     response = cupsDoRequest(http, request, "/admin/");
+ 
+-    if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
++    if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT))
+     {
+         r = 1;
+     }
+@@ -837,7 +877,7 @@ abort:
+     if ( response != NULL )
+         ippDelete( response );
+ 
+-    return Py_BuildValue( "i", r );;
++    return Py_BuildValue( "i", r );
+ }
+ 
+ 
+@@ -1116,8 +1156,8 @@ PyObject * getPPDList( PyObject * self,
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_GET_PPDS;
+-    request->request.op.request_id   = 1;
++    ippSetOperation( request, CUPS_GET_PPDS );
++    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -1143,43 +1183,43 @@ PyObject * getPPDList( PyObject * self,
+     if ((response = cupsDoRequest(http, request, "/")) != NULL)
+     {
+ 
+-        for (attr = response->attrs; attr; attr = attr->next)
++        for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response ))
+         {
+             PyObject *dict;
+             char *ppdname = NULL;
+ 
+-            while (attr && attr->group_tag != IPP_TAG_PRINTER)
+-                attr = attr->next;
++            while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
++                attr = ippNextAttribute( response );
+ 
+             if (!attr)
+                 break;
+ 
+             dict = PyDict_New ();
+ 
+-            for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
++            for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response ))
+             {
+                 PyObject *val = NULL;
+ 
+-                if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
++                if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME)
+                 {
+-                    ppdname = attr->values[0].string.text;
++                    ppdname = ippGetString( attr, 0, NULL );
+ 
+                     //sprintf( buf, "print '%s'", ppdname);
+                     //PyRun_SimpleString( buf );
+                 }
+ 
+-                else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
+-                //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
+-                //    (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
+-                //    (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
+-                //    (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
++                else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD)
++                //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) ||
++                //    (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
++                //    (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
++                //    (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT))
+                 {
+-                    val = PyObj_from_UTF8(attr->values[0].string.text);
++                    val = PyObj_from_UTF8(ippGetString( attr, 0, NULL ));
+                 }
+ 
+                 if (val)
+                 {
+-                    PyDict_SetItemString (dict, attr->name, val);
++                    PyDict_SetItemString (dict, ippGetName( attr ), val);
+                     Py_DECREF (val);
+                 }
+             }
+diff -up hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors hplip-3.12.6/scan/sane/hpaio.c
+--- hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors	2012-06-18 12:42:51.000000000 +0200
++++ hplip-3.12.6/scan/sane/hpaio.c	2012-07-19 17:12:34.557848760 +0200
+@@ -47,6 +47,43 @@
+ #define DEBUG_DECLARE_ONLY
+ #include "sanei_debug.h"
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetGroupTag(attr)  attr->group_tag
++#define ippGetValueTag(attr)  attr->value_tag
++#define ippGetName(attr)      attr->name
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
++{
++    if (!ipp)
++        return (NULL);
++    return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
++{
++    if (!ipp || !ipp->current)
++        return (NULL);
++    return (ipp->current = ipp->current->next);
++}
++
++static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
++{
++    ipp->request.op.operation_id = op;
++    return (1);
++}
++
++static int ippSetRequestId( ipp_t *ipp, int request_id )
++{
++    ipp->request.any.request_id = request_id;
++    return (1);
++}
++#endif
++
+ static SANE_Device **DeviceList = NULL;
+ 
+ static int AddDeviceList(char *uri, char *model, SANE_Device ***pd)
+@@ -186,8 +223,8 @@ static int GetCupsPrinters(char ***print
+    /* Assemble the IPP request */
+    request = ippNew();
+ 
+-   request->request.op.operation_id = CUPS_GET_PRINTERS;
+-   request->request.any.request_id  = 1;
++   ippSetOperation( request, CUPS_GET_PRINTERS );
++   ippSetRequestId( request, 1 );
+ 
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en");
+@@ -197,20 +234,20 @@ static int GetCupsPrinters(char ***print
+    if ((response = cupsDoRequest(http, request, "/")) == NULL)
+       goto bugout;
+ 
+-   for (attr = response->attrs; attr != NULL; attr = attr->next)
++   for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response ))
+    {
+       /* Skip leading attributes until we hit a printer. */
+-      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
+-         attr = attr->next;
++      while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
++         attr = ippNextAttribute( response );
+ 
+       if (attr == NULL)
+          break;
+ 
+-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
++      while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER)
+       {
+-         if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0)
++         if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0)
+             cnt++;
+-         attr = attr->next;
++         attr = ippNextAttribute( response );
+       }
+ 
+       if (attr == NULL)