diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/cups-filters-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/hplip-libre/PKGBUILD | 42 | ||||
-rw-r--r-- | libre/hplip-libre/cups-1.6-buildfix.diff | 392 | ||||
-rw-r--r-- | libre/iceweasel-i18n/PKGBUILD | 180 | ||||
-rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/iceweasel-libre/libre.patch | 24 | ||||
-rw-r--r-- | libre/xulrunner-libre/PKGBUILD | 17 | ||||
-rw-r--r-- | libre/xulrunner-libre/shared-libs.patch | 12 |
8 files changed, 544 insertions, 141 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) diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 406cb3c32..6dbc74148 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -9,7 +9,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=17.0 +_debver=17.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=17.0 +_pkgver=17.0.1 pkgver=${_debver}.${_debrel} pkgrel=1 @@ -56,91 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('aca195b6aa9da7fbf568c08f66f966f2' - 'e026ffecfd999b9ec8a38f3f2f29f4b5' - '4e1e3a700a7c64556fe7281447b2ee08' - '68586be8b467b4faf8e0822817a8a844' - '0855365b830c4558ec23b0976d258356' - '0e4857a39eab45b03607f0a18d469be6' - '3d47320eb012880e38344237cd2ee1ff' - 'd37290ecae4792f97302347c2d9b72fa' - 'ff8b22a9853a0876b42254dc856f8222' - '1d57aefb5d8200756e5751b6b660ba69' - 'b527326e74cb330a0e2ec36f47930e90' - '8a4ad51e5a9328b3437a5b1dc0ecf613' - 'c58a6d0ae9bc48d01775f91d84c8afda' - '01ffe65230eaf9551ea45d6d2d607cdc' - '735c3e03920964711b9914710fe37b56' - 'e25a3627c72b4e7a52bf00ccc087aa69' - 'f576d51ac7fa505133f75634af3a14dc' - 'd82798c091826fcff1552240669bf72d' - 'cdd5ec962ed5507eb63ff3cb42f77e19' - '8ff7b9281ffecc76831315ce3423db93' - 'e53f4816e34487e6c659dff373aae482' - 'cf7793dfcbf18d97ffd7168228767da8' - '20ca3aee8bf43c675f7fb160f5f3359e' - '228e40322a1fcf6fed867fec81b7c702' - 'a17b3619eeb977c11e5f99b527c26c12' - '180b5a570d1117d0f08c7ca9f43e9796' - 'c1a2dc0954ec3d58de0b46f9efb56c86' - 'df546f876542bd474656fc27bfea8afe' - 'fdb7d6212ed888759422222018289c27' - 'af55d3b4ab09fefde72a14f2d869bedb' - 'a0235aace986ccf2f66b8f7e3b7878af' - '4550a84b0884a7eb2530031b8cf7bd13' - '1a81ba0771c82680cb10182247503703' - '99950e68df786e47b896e784bd749d53' - '81f8ff7132d27e04ef18e743aeb7e6b5' - 'bffdcadd6c0e44013eca8d3cb3ff4e91' - '44726dde95fb92a9c96de3424784b420' - 'e70e64366cb381b583e19945ec78f465' - '38fcd722bc60540ecb347b52237595d2' - 'dfcc1dad5e95a1460737c70ccd4b5735' - '941183e99dc85e6b8a834a52f101784a' - 'eb2e91b9991161891d039eb4c40a25a3' - '7c509a226c72005e5c9bf4e83bb80abf' - 'cf7ce1659ee0af3fd6e9fccf6b0b7d62' - 'ab47d4c2d8ecf8c9a093529edc4cdd17' - '236cfdaa476eabe1d89e5d03ae83c5f0' - 'ab572cadb8b952aa0d165ff796f92084' - '8c7396b7010b6afe8b1cc5625405762c' - '2adac2f2c2bfc1216b3d7e3944e5a6c5' - 'fc544cdd63ce46d72694f296b90e807d' - '46ebea9850dd4f8b5bc8134b0e00fa88' - '8459c0e2ee2ad97b8828b3ae458c7a30' - '212ad5e037ae26e06a29e96076a46d88' - '483f0bc2b12782d93aff4ebd6c9d72bc' - '69331b072dc1978c7aedc05105b3dab7' - '9c325dc249e935e32c1bf573a8bf8a03' - 'dc065160d7d7109aca5e5abee88a38dd' - '63e0f6e5123b976ba91679e4b0668117' - '670301325560f01a65a1516c063ba0ab' - 'bf5754aa9937ca01796724bad4128348' - 'd37a9af438ede3c95c4147776c1881c7' - '00b6aa1338665c1ddd830332eba3e869' - 'fd6df56ae64208669b771cd44edbdf22' - 'd28ba0c094d0ac6ca8839b6f24b8e36d' - 'ddb04a9c43a0a7e3a410a56292abeab0' - '195d2b735f34c04505ca68c0f614805a' - '6fc7618c6bd4143a8f1e58a560b7a9b2' - 'aa1558345b96e6cc3b0c9c22fe3540a8' - '37a43a703b46f3275f960abd9852bae3' - '523d2d66af36dbd862156fefd183169a' - 'af4e4651a8e379d9ca151ae3180d4090' - '79240b7df3c53d122ddf7c734e83fdfa' - '4bc316dfd0cbb235e787f031155a70f4' - 'e04f0b6cb1c79345a989feeaba6adba0' - '4d294d9984a14c7f703a9e92a5144de9' - 'b1d70ed8d43a3655c2134c7ee32552b3' - '4b0decc563ef2f308cb76691e7a20ef6' - 'eec9a1717554a85671d4971757cb302d' - '588bb4c21d74f3db326ca527dc9fe593' - '704173008a109a4ca888bce6abdd1ea0' - '8c230dd567c576ca9e2d7cd40923623c' - '6dd510df2583839646268121db4ee517' - '2b915a4d899364934bc04e3ffe693279' - '3ac196603d06fa52746c56b431f0778d' - '90ff7e2af56d59cefb941043e6bcd5d5' - '77a39f2723940c6312798c65dbb602dc' - 'd7fe6dded2ac3aa1dc697e3b46c8d4d5' - 'feff9895b8d7678e208947c40c7f53e0')
\ No newline at end of file +md5sums=('c99d7605c0e0bb0d77e71cd54f305a9a' + '1f4aeabf6c28fcf6539d13f65f8b366b' + 'cb9cc5f721d81442f1a93d134054f23c' + 'f926850d2071114f4ba719230ce43168' + '8c414a4f8d6d137dcca41b203fce4d0c' + 'a16081e4da9daf6df5f6fcce2000cec1' + '88dd4c5837485acea83e97f3cb4f1e31' + '8751f0a634656ba973c53f96d1fa34e1' + 'a3905a8a62c0b5ba4c11fee49ad6d184' + '740667ba651f0562b45bbfe63b8ec84e' + '85a7a4de61e5546487dae32849ae63f2' + '3d00ad2734c890930441d6cd919f11c8' + '80a49422e0973ed8d6fd7920cf0a4379' + '30ce51ca764b091c59df5c08e35e8a7f' + '3fdbb51a5cbea3f6a7c43534a8c67d5a' + '1eacf81985d9993b2b94f98fd4c453e0' + 'ccd6c210bf596909137c4159580042eb' + '688c3eeca95418703bf6c2cb0dbe18d0' + '3830cab7a1b48890588cfbeb42444a22' + '6924436432149b668e14c3595602af79' + 'ae6007384d85dbd14fbe6496e0b9e47b' + '3859dac30bf0ec9d49419c83b116407e' + '4c200fc11efb425ba1ed0c6254f323a5' + '200f856b50a7485a1d5447cbf8dee77c' + '5b8d0c552c0ca7abb48ef4e94908edd2' + 'c6dde21438789ccf4c666afc22ee713c' + 'b234e98c5155fb597fa6f5b1242492ec' + '5abfc72599632a0ac85f18b4f706ee71' + 'a78698a63ef66d5532601f76f48613c3' + 'cca18bf0e95da80578d1e71a7592a545' + '9213e16598b0595710583956fa95dfff' + '120a4a00c1775a8445d35266b3157112' + 'cf94d425550530b34e355ed445618626' + 'dbf451ef9ecf1816973ac4dffe7e2b8e' + '87a12e25b99886ac25cb0d9f0ca201ad' + '0efff47ab838fd320c710ffd46ee3a57' + '28e5d445e7a91ddd64d50478b05edb51' + '770dcdf1a8d6d2db64dadb6e4f6149fb' + '7732b021cdf73ace33cb41609b327f3d' + 'ac79148f7bbdeff056d10cf0542f6ea0' + '4718bff38f0a6c8ec7b41df148255f34' + '2edcd565c19828e3d4a2da19f8529edd' + '531c54a91d509e768b55bfd88a96a527' + 'c8a4d346560350fd45533e52c0e6a15e' + '707d055b9d86ba16b2a44376a6cf3fb9' + '66b2b23c7e16840554521c748a22d083' + '61e53be2eeb528742c19d3a13252a961' + '89c23536240f86a776fb62728297e13d' + '535f68d0cfa4dee9df0cddbee42a4c94' + '7c91dc4f2bbcdac2f8547caad24516ea' + '4476b94e676b3cfb309f972f7c42da1b' + '792700b40ba53de7de5b48187b604b29' + '500861d2d8bebc85596a3ee343adb75e' + 'b2f5d243b28a9137189b6fa001c0207e' + 'a36a7b1785532e659d3b972e4e767f45' + '46509bb591bf54b6fed025814bfc11bf' + '715a3f8c2fcdab17b24ce61f55c49183' + '658226211d66a724d0335a173ef8512f' + 'ecb41c7536c95cf2ca118d7ab6b7d357' + '3b832ba3a5d1543809395171e5a105f6' + '46380a60795095514004bc19c512e1c5' + 'fba979124cd393f1164a59e3b9183ccc' + 'db0e3b1146b0350e23e35958ee896aa5' + '665140babab027228eb195b6c0e83d4e' + 'e71a740bfc52d25968f8e2c4c1896897' + '47bd00559728578bfc257b80c72ce393' + '0b77be5ee8a66f5b819f9bf032f1b744' + '38df23959bd6940a82e78f76a00cc973' + 'b6c74d7b9cf5f6722c661bdba78c3769' + '481db49b914f33d6c594ecebbc291e4c' + '6a680e3aa71a39a1d59f877535eb7bbc' + '9ee935f09dc89b42db9ad8db3473717d' + 'e9ad600f21766465aed4ae8473290077' + 'b70d217d69692ea3fb26e87fa468f4eb' + '32b73226e95ae47dc11a554a7208d960' + '5b78c67c024c683f4c0f1bc9931a2b28' + 'f7a347a3d5679d82340d227474de938f' + '2939f738602daee17e63e14374db86be' + '73bead055152cd4885b9834691c9066a' + '722a0d2212060e2044cbac859db3e063' + '8f259efea0bf1b67fd4b4dae492e2e00' + '03c2a59eab8ef4ad3687b91c07f96165' + '726317125b44225273307235f609d341' + 'b75b729e9ab3ff9a908115ab520339a9' + 'cd696e70fdb4f5ab9d50040abea46b82' + 'cdd2dba79e929e6585799d7f3f7fa7d4' + '0b611a362d7e566805c2df474ff407b6' + 'de6037c0a65e7b86e0929637156ba587')
\ No newline at end of file diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index fe987068a..709f72608 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=17.0 +_debver=17.0.1 _debrel=1 [ "$CARCH" == "mips64el" ] && { _debver=13.0.1; _debrel=2; } _debrepo=http://ftp.debian.org/debian/pool/main/ @@ -23,7 +23,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -53,12 +53,12 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('3e555026478026987753b4859ec91d3b' - '9b07815d94b8190c780fac10009025b9' +md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' + '1bbf435ff33f9824de23c0b13fbfb452' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '3956dd8d3c153c2d8a608065a6d522c0' + '1570f4402cd46ffffeb7e302b2fb285d' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index c257f04fe..d0f392be3 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -165,15 +165,6 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o /* preference for the locale picker */ pref("extensions.getLocales.get.url", ""); -@@ -259,7 +259,7 @@ - pref("dom.disable_window_find", true); - - pref("keyword.enabled", true); --pref("keyword.URL", ""); -+pref("keyword.URL", "https://duckduckgo.com/html/?q="); - - pref("accessibility.typeaheadfind", false); - pref("accessibility.typeaheadfind.timeout", 5000); diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul --- iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300 +++ iceweasel-13.0/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300 @@ -213,14 +204,14 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile pref("keyword.enabled", true); -pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q="); -+pref("keyword.URL", "https://duckduckgo.com/html/?q="); ++pref("keyword.URL", ""); pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-17.0/mobile/locales/en-US/chrome/region.properties --- iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties 2012-11-20 00:46:15.000000000 -0200 -+++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties 2012-11-28 12:42:29.600175386 -0200 -@@ -3,34 +3,10 @@ ++++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties 2012-11-30 01:51:40.078652322 -0200 +@@ -3,34 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -236,9 +227,8 @@ diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties icew -browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s -browser.contentHandlers.types.1.title=Google -browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s -+browser.search.order.1=DuckDuckGo HTML - - # Keyword URL (for location bar searches) +- +-# Keyword URL (for location bar searches) -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= - -# increment this number when anything gets changed in the list below. This will @@ -257,7 +247,7 @@ diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties icew -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -+keyword.URL=https://duckduckgo.com/html/?q= ++browser.search.order.1=DuckDuckGo HTML diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js --- iceweasel-14.0.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300 +++ iceweasel-14.0/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300 @@ -266,7 +256,7 @@ diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/mod // The first character after a period must be alphabetic. -pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL", "https://duckduckgo.com/html/?q="); ++pref("keyword.URL", ""); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index e9cd2a447..1d485e6d5 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160908 2012-06-06 17:03:39Z ibiru $ +# $Id: PKGBUILD 172187 2012-12-01 13:09:58Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,7 +6,7 @@ # We're getting this from Debian Experimental _debname=iceweasel -_debver=17.0 +_debver=17.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -25,15 +25,17 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig mozilla-pkgconfig.patch + shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('3e555026478026987753b4859ec91d3b' - '9b07815d94b8190c780fac10009025b9' +md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' + '1bbf435ff33f9824de23c0b13fbfb452' 'f2f4f4a573f549e8b494e33b3ad226bc' '27271ce647a83906ef7a24605e840d61' + '52e52f840a49eb1d14be1c0065b03a93' '65f68090d2a69b467bd2707d0c4ea3bd') build() { @@ -63,6 +65,7 @@ build() { #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + patch -Np1 -i "$srcdir/shared-libs.patch" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}" export PYTHON="/usr/bin/python2" @@ -83,8 +86,6 @@ package() { echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/header.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/typelib.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpidl.py" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/{xpt,header,typelib,xpidl}.py } diff --git a/libre/xulrunner-libre/shared-libs.patch b/libre/xulrunner-libre/shared-libs.patch new file mode 100644 index 000000000..1f22b2b0d --- /dev/null +++ b/libre/xulrunner-libre/shared-libs.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 +@@ -50,7 +50,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ |