diff options
Diffstat (limited to 'print')
-rw-r--r-- | print/libgnomecups/Makefile | 30 | ||||
-rw-r--r-- | print/libgnomecups/distinfo | 2 | ||||
-rw-r--r-- | print/libgnomecups/files/patch-20_parse-dot-cups-lpoptions | 14 | ||||
-rw-r--r-- | print/libgnomecups/files/patch-21_fix-islocal | 17 | ||||
-rw-r--r-- | print/libgnomecups/files/patch-22_ignore-ipp-not-found | 12 | ||||
-rw-r--r-- | print/libgnomecups/files/patch-23_replace-set-printer-attrs | 36 | ||||
-rw-r--r-- | print/libgnomecups/files/patch-25_browsed_ppds | 50 | ||||
-rw-r--r-- | print/libgnomecups/files/patch-libgnomecups_gnome-cups-i18n.c | 9 | ||||
-rw-r--r-- | print/libgnomecups/files/patch-libgnomecups_gnome-cups-init.h | 12 | ||||
-rw-r--r-- | print/libgnomecups/pkg-descr | 3 | ||||
-rw-r--r-- | print/libgnomecups/pkg-plist | 66 |
11 files changed, 251 insertions, 0 deletions
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile new file mode 100644 index 000000000..2cc52892d --- /dev/null +++ b/print/libgnomecups/Makefile @@ -0,0 +1,30 @@ +# New ports collection makefile for: libgnomecups +# Date created: 14 Jul 2003 +# Whom: Glenn Johnson <glennpj@charter.net> +# +# $FreeBSD: ports/print/libgnomecups/Makefile,v 1.31 2011/09/23 22:25:01 amdmi3 Exp $ +# + +PORTNAME= libgnomecups +PORTVERSION= 0.2.3 +PORTREVISION= 5 +PORTEPOCH= 1 +CATEGORIES= print gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Support library for gnome cups admistration + +LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack intlhack ltverhack glib20 +USE_GETTEXT= yes +USE_LDCONFIG= yes +USE_AUTOTOOLS= libtool +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +.include <bsd.port.mk> diff --git a/print/libgnomecups/distinfo b/print/libgnomecups/distinfo new file mode 100644 index 000000000..640f24517 --- /dev/null +++ b/print/libgnomecups/distinfo @@ -0,0 +1,2 @@ +SHA256 (gnome2/libgnomecups-0.2.3.tar.bz2) = e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29 +SIZE (gnome2/libgnomecups-0.2.3.tar.bz2) = 357129 diff --git a/print/libgnomecups/files/patch-20_parse-dot-cups-lpoptions b/print/libgnomecups/files/patch-20_parse-dot-cups-lpoptions new file mode 100644 index 000000000..ff62dc254 --- /dev/null +++ b/print/libgnomecups/files/patch-20_parse-dot-cups-lpoptions @@ -0,0 +1,14 @@ +diff -pruN 0.2.2-1/libgnomecups/gnome-cups-printer.c 0.2.2-1ubuntu5/libgnomecups/gnome-cups-printer.c +--- 0.2.2-1/libgnomecups/gnome-cups-printer.c 2005-09-23 21:52:49.000000000 +0100 ++++ libgnomecups/gnome-cups-printer.c 2006-06-27 16:21:38.000000000 +0100 +@@ -510,6 +510,10 @@ parse_lpoptions (cups_dest_t **dests) + num_dests = cups_get_dests (filename, num_dests, dests); + g_free (filename); + ++ filename = g_build_filename (g_get_home_dir (), ".cups", "lpoptions", NULL); ++ num_dests = cups_get_dests (filename, num_dests, dests); ++ g_free (filename); ++ + return num_dests; + } + diff --git a/print/libgnomecups/files/patch-21_fix-islocal b/print/libgnomecups/files/patch-21_fix-islocal new file mode 100644 index 000000000..af6fa5351 --- /dev/null +++ b/print/libgnomecups/files/patch-21_fix-islocal @@ -0,0 +1,17 @@ +diff -pruN 0.2.2-1/libgnomecups/gnome-cups-printer.c 0.2.2-1ubuntu5/libgnomecups/gnome-cups-printer.c +--- 0.2.2-1/libgnomecups/gnome-cups-printer.c 2005-09-23 21:52:49.000000000 +0100 ++++ libgnomecups/gnome-cups-printer.c 2006-06-27 16:21:38.000000000 +0100 +@@ -976,8 +980,11 @@ gnome_cups_printer_get_is_local (GnomeCu + { + g_return_val_if_fail (GNOME_CUPS_IS_PRINTER (printer), FALSE); + +- return (printer->details->device_uri != NULL) && +- (strcmp (printer->details->device_uri, "") != 0); ++ return printer->details->device_uri != NULL && ++ strncmp(printer->details->device_uri, "smb:", 4) != 0 && ++ strncmp(printer->details->device_uri, "http:", 5) != 0 && ++ strncmp(printer->details->device_uri, "https:", 5) != 0 && ++ strncmp(printer->details->device_uri, "ipp:", 4) != 0; + } + + void diff --git a/print/libgnomecups/files/patch-22_ignore-ipp-not-found b/print/libgnomecups/files/patch-22_ignore-ipp-not-found new file mode 100644 index 000000000..8bd4424b3 --- /dev/null +++ b/print/libgnomecups/files/patch-22_ignore-ipp-not-found @@ -0,0 +1,12 @@ +diff -pruN 0.2.2-1/libgnomecups/gnome-cups-request.c 0.2.2-1ubuntu5/libgnomecups/gnome-cups-request.c +--- 0.2.2-1/libgnomecups/gnome-cups-request.c 2005-03-28 16:43:06.000000000 +0100 ++++ libgnomecups/gnome-cups-request.c 2006-06-27 16:21:38.000000000 +0100 +@@ -349,7 +349,7 @@ request_thread_main (GnomeCupsRequest *r + 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, diff --git a/print/libgnomecups/files/patch-23_replace-set-printer-attrs b/print/libgnomecups/files/patch-23_replace-set-printer-attrs new file mode 100644 index 000000000..ded608b11 --- /dev/null +++ b/print/libgnomecups/files/patch-23_replace-set-printer-attrs @@ -0,0 +1,36 @@ +diff -pruN 0.2.2-1/libgnomecups/gnome-cups-printer.c 0.2.2-1ubuntu5/libgnomecups/gnome-cups-printer.c +--- 0.2.2-1/libgnomecups/gnome-cups-printer.c 2005-09-23 21:52:49.000000000 +0100 ++++ libgnomecups/gnome-cups-printer.c 2006-06-27 16:21:38.000000000 +0100 +@@ -1237,6 +1244,9 @@ gnome_cups_printer_get_description (Gnom + + } + ++/* Define the CUPS-Add-Modify-Printer, see http://www.cups.org/documentation.php/spec-ipp.html#CUPS_ADD_MODIFY_PRINTER */ ++#define CUPS_ADD_MODIFY_PRINTER 0x4003 ++ + void + gnome_cups_printer_set_description (GnomeCupsPrinter *printer, + const char *description, +@@ -1252,7 +1262,9 @@ gnome_cups_printer_set_description (Gnom + return; + } + +- request = gnome_cups_request_new_for_printer (IPP_SET_PRINTER_ATTRIBUTES, ++ /* As read in http://lists.samba.org/archive/samba-technical/2003-February/027044.html ++ CUPS does not currently support IPP_SET_PRINTER_ATTRIBUTES, so a is used */ ++ request = gnome_cups_request_new_for_printer (CUPS_ADD_MODIFY_PRINTER, + printer); + ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_TEXT, + "printer-info", NULL, description); +@@ -1283,9 +1295,9 @@ gnome_cups_printer_set_location (GnomeCu + if (!strcmp (location, printer->details->location)) { + return; + } +- ++ /* Same as above (IPP_SET_PRINTER_ATTRIBUTES replaced by CUPS-Add-Modify-Printer ) */ + request = gnome_cups_request_new_for_printer ( +- IPP_SET_PRINTER_ATTRIBUTES, printer); ++ CUPS_ADD_MODIFY_PRINTER, printer); + ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_TEXT, + "printer-location", NULL, location); + response = gnome_cups_request_execute (request, NULL, "/admin/", error); diff --git a/print/libgnomecups/files/patch-25_browsed_ppds b/print/libgnomecups/files/patch-25_browsed_ppds new file mode 100644 index 000000000..902eb029d --- /dev/null +++ b/print/libgnomecups/files/patch-25_browsed_ppds @@ -0,0 +1,50 @@ +diff -Nur libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c libgnomecups-0.2.2.new/libgnomecups/gnome-cups-printer.c +--- libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c 2006-09-18 10:23:13.000000000 +0200 ++++ libgnomecups/gnome-cups-printer.c 2006-09-18 10:23:18.000000000 +0200 +@@ -1105,7 +1105,7 @@ + return NULL; + } + +- host = _gnome_cups_printer_get_host (printer); ++ host = _gnome_cups_printer_get_ppd_host (printer); + ppdpath = get_ppd_uri_path (printer); + + gnome_cups_request_file (host, ppdpath, fd, &error); +@@ -1976,3 +1976,26 @@ + + return host; + } ++ ++gchar * ++_gnome_cups_printer_get_ppd_host (GnomeCupsPrinter *printer) ++{ ++ gchar *host = NULL; ++ ++ if (printer->details->printer_uri) { ++ gchar *x, *y; ++ ++ x = strstr (printer->details->printer_uri, "://"); ++ ++ if (x) { ++ x += 3; ++ y = strpbrk (x, ":/"); ++ if (y) ++ host = g_strndup (x, y - x); ++ else ++ host = g_strdup (x); ++ } ++ } ++ ++ return host; ++} +diff -Nur libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.h libgnomecups-0.2.2.new/libgnomecups/gnome-cups-printer.h +--- libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.h 2005-03-04 14:43:33.000000000 +0100 ++++ libgnomecups/gnome-cups-printer.h 2006-09-18 10:23:18.000000000 +0200 +@@ -184,6 +184,7 @@ + /* Private */ + void _gnome_cups_printer_init (void); + gchar *_gnome_cups_printer_get_host (GnomeCupsPrinter *printer); ++gchar *_gnome_cups_printer_get_ppd_host (GnomeCupsPrinter *printer); + + G_END_DECLS + diff --git a/print/libgnomecups/files/patch-libgnomecups_gnome-cups-i18n.c b/print/libgnomecups/files/patch-libgnomecups_gnome-cups-i18n.c new file mode 100644 index 000000000..bfe8c876b --- /dev/null +++ b/print/libgnomecups/files/patch-libgnomecups_gnome-cups-i18n.c @@ -0,0 +1,9 @@ +--- libgnomecups/gnome-cups-i18n.c.orig 2012-06-07 10:55:30.000000000 +0200 ++++ libgnomecups/gnome-cups-i18n.c 2012-06-07 10:55:37.000000000 +0200 +@@ -1,5 +1,5 @@ + #include <config.h> +-#include <glib/gmacros.h> ++#include <glib.h> + #include "gnome-cups-i18n.h" + + #ifdef ENABLE_NLS diff --git a/print/libgnomecups/files/patch-libgnomecups_gnome-cups-init.h b/print/libgnomecups/files/patch-libgnomecups_gnome-cups-init.h new file mode 100644 index 000000000..688ddc36c --- /dev/null +++ b/print/libgnomecups/files/patch-libgnomecups_gnome-cups-init.h @@ -0,0 +1,12 @@ +--- libgnomecups/gnome-cups-init.h.orig 2012-06-07 10:56:20.000000000 +0200 ++++ libgnomecups/gnome-cups-init.h 2012-06-07 10:56:30.000000000 +0200 +@@ -1,8 +1,7 @@ + #ifndef GNOME_CUPS_INIT + #define GNOME_CUPS_INIT + +-#include <glib/gtypes.h> +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/print/libgnomecups/pkg-descr b/print/libgnomecups/pkg-descr new file mode 100644 index 000000000..01d3dd912 --- /dev/null +++ b/print/libgnomecups/pkg-descr @@ -0,0 +1,3 @@ +Support library for Cups adminstration through GNOME. + +WWW: http://www.gnome.org/ diff --git a/print/libgnomecups/pkg-plist b/print/libgnomecups/pkg-plist new file mode 100644 index 000000000..660a8be7b --- /dev/null +++ b/print/libgnomecups/pkg-plist @@ -0,0 +1,66 @@ +include/libgnomecups-1/libgnomecups/gnome-cups-init.h +include/libgnomecups-1/libgnomecups/gnome-cups-printer.h +include/libgnomecups-1/libgnomecups/gnome-cups-queue.h +include/libgnomecups-1/libgnomecups/gnome-cups-request.h +include/libgnomecups-1/libgnomecups/gnome-cups-util.h +lib/libgnomecups-1.0.a +lib/libgnomecups-1.0.la +lib/libgnomecups-1.0.so +lib/libgnomecups-1.0.so.1 +libdata/pkgconfig/libgnomecups-1.0.pc +share/locale/ar/LC_MESSAGES/libgnomecups.mo +share/locale/bg/LC_MESSAGES/libgnomecups.mo +share/locale/ca/LC_MESSAGES/libgnomecups.mo +share/locale/cs/LC_MESSAGES/libgnomecups.mo +share/locale/da/LC_MESSAGES/libgnomecups.mo +share/locale/de/LC_MESSAGES/libgnomecups.mo +share/locale/dz/LC_MESSAGES/libgnomecups.mo +share/locale/en_CA/LC_MESSAGES/libgnomecups.mo +share/locale/en_GB/LC_MESSAGES/libgnomecups.mo +share/locale/es/LC_MESSAGES/libgnomecups.mo +share/locale/eu/LC_MESSAGES/libgnomecups.mo +share/locale/fi/LC_MESSAGES/libgnomecups.mo +share/locale/fr/LC_MESSAGES/libgnomecups.mo +share/locale/gl/LC_MESSAGES/libgnomecups.mo +share/locale/gu/LC_MESSAGES/libgnomecups.mo +share/locale/hi/LC_MESSAGES/libgnomecups.mo +share/locale/hr/LC_MESSAGES/libgnomecups.mo +share/locale/hu/LC_MESSAGES/libgnomecups.mo +share/locale/is/LC_MESSAGES/libgnomecups.mo +share/locale/it/LC_MESSAGES/libgnomecups.mo +share/locale/ja/LC_MESSAGES/libgnomecups.mo +share/locale/lt/LC_MESSAGES/libgnomecups.mo +share/locale/mk/LC_MESSAGES/libgnomecups.mo +share/locale/nb/LC_MESSAGES/libgnomecups.mo +share/locale/ne/LC_MESSAGES/libgnomecups.mo +share/locale/nl/LC_MESSAGES/libgnomecups.mo +share/locale/oc/LC_MESSAGES/libgnomecups.mo +share/locale/pa/LC_MESSAGES/libgnomecups.mo +share/locale/pl/LC_MESSAGES/libgnomecups.mo +share/locale/pt/LC_MESSAGES/libgnomecups.mo +share/locale/pt_BR/LC_MESSAGES/libgnomecups.mo +share/locale/rw/LC_MESSAGES/libgnomecups.mo +share/locale/sk/LC_MESSAGES/libgnomecups.mo +share/locale/sl/LC_MESSAGES/libgnomecups.mo +share/locale/sq/LC_MESSAGES/libgnomecups.mo +share/locale/sr/LC_MESSAGES/libgnomecups.mo +share/locale/sr@Latn/LC_MESSAGES/libgnomecups.mo +share/locale/sv/LC_MESSAGES/libgnomecups.mo +share/locale/th/LC_MESSAGES/libgnomecups.mo +share/locale/tr/LC_MESSAGES/libgnomecups.mo +share/locale/uk/LC_MESSAGES/libgnomecups.mo +share/locale/vi/LC_MESSAGES/libgnomecups.mo +share/locale/wa/LC_MESSAGES/libgnomecups.mo +share/locale/zh_CN/LC_MESSAGES/libgnomecups.mo +share/locale/zh_HK/LC_MESSAGES/libgnomecups.mo +share/locale/zh_TW/LC_MESSAGES/libgnomecups.mo +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry include/libgnomecups-1/libgnomecups +@dirrmtry include/libgnomecups-1 |