summaryrefslogtreecommitdiff
path: root/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernandez <hahj87@gmail.com>2011-05-19 12:44:24 -0500
committerJoshua Ismael Haase Hernandez <hahj87@gmail.com>2011-05-19 12:44:24 -0500
commit071445e6a2bb31ddf638e6f2e5362953b47e72dc (patch)
tree9ec266d72aaa5971dee2d1abbe2de511d971de87 /testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch
parentc14218d562c03601d6d23666f77ed0c2f0025c1b (diff)
parentb8ea4461e461f0e1782e28b5810eb811423afa79 (diff)
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el into pre
Conflicts: core/heimdal/PKGBUILD extra/apache-ant/PKGBUILD extra/aria2/PKGBUILD extra/bs/PKGBUILD extra/dosbox/PKGBUILD extra/ettercap-gtk/PKGBUILD extra/gqmpeg/PKGBUILD extra/gtk-theme-switch2/PKGBUILD extra/icecast/PKGBUILD extra/kmldonkey/PKGBUILD extra/kmplayer/PKGBUILD extra/libbtctl/PKGBUILD extra/libx86/PKGBUILD extra/mc/PKGBUILD extra/monotone/PKGBUILD extra/nbsmtp/PKGBUILD extra/nickle/PKGBUILD extra/nppangband/PKGBUILD extra/numlockx/PKGBUILD extra/python-gtkglext/PKGBUILD extra/speedcrunch/PKGBUILD extra/vbetool/PKGBUILD libre/xchat-gnome-libre/PKGBUILD libre/xchat-gnome-libre/gtk2-2.20.patch libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch libre/xchat-gnome-libre/xchat-gnome.install
Diffstat (limited to 'testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch')
-rw-r--r--testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch11
1 files changed, 0 insertions, 11 deletions
diff --git a/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch b/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch
deleted file mode 100644
index 797367bf9..000000000
--- a/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libgnomecups/gnome-cups-request.c 2007-01-31 10:49:17.000000000 -0800
-+++ b/libgnomecups/gnome-cups-request.c 2009-11-24 12:49:30.000000000 -0800
-@@ -349,7 +349,7 @@
- if (request->response == NULL)
- status = IPP_INTERNAL_ERROR;
-
-- if (status > IPP_OK_CONFLICT) {
-+ if (status > IPP_OK_CONFLICT && status != IPP_NOT_FOUND) {
- g_warning ("IPP request failed with status %d", status);
- if (request->error != NULL)
- *(request->error) = g_error_new (GNOME_CUPS_ERROR,