cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove libgnomecups; unused and deprecated.

Browse Source
This commit is contained in:
ajacoutot 2011-09-12 13:46:53 +00:00
parent e85afb1b14
commit 4d260ad5c8
9 changed files with 1 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.157 2011/09/12 08:46:10 jasper Exp $
# $OpenBSD: Makefile,v 1.158 2011/09/12 13:46:53 ajacoutot Exp $
SUBDIR =
SUBDIR += alacarte
@ -49,7 +49,6 @@
SUBDIR += libgnome-keyring
SUBDIR += libgnome-media-profiles
SUBDIR += libgnomecanvas
SUBDIR += libgnomecups
SUBDIR += libgnomekbd
SUBDIR += libgnomeprint
SUBDIR += libgnomeui

37
x11/gnome/libgnomecups/Makefile
View File

@ -1,37 +0,0 @@
# $OpenBSD: Makefile,v 1.16 2011/09/12 12:04:17 jasper Exp $
COMMENT= GNOME library for CUPS interaction
GNOME_PROJECT= libgnomecups
GNOME_VERSION= 0.2.3
REVISION= 7
SHARED_LIBS= gnomecups-1.0 1.0 # .1.0
CATEGORIES= devel
HOMEPAGE= http://projects.gnome.org/gnome-print/
# LGPLv2/GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
WANTLIB += asn1 crypto gssapi krb5 m pcre ssl z glib-2.0 gobject-2.0
WANTLIB += gthread-2.0 cups
MODULES= devel/gettext \
x11/gnome
LIB_DEPENDS= devel/glib2 \
print/cups
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

5
x11/gnome/libgnomecups/distinfo
View File

@ -1,5 +0,0 @@
MD5 (gnome/libgnomecups-0.2.3.tar.bz2) = 3EkgwVyfiG9z6nT7/wrkiw==
RMD160 (gnome/libgnomecups-0.2.3.tar.bz2) = IrgzNZquI3BnkZ52wjRWieHQUFo=
SHA1 (gnome/libgnomecups-0.2.3.tar.bz2) = CdTcTkz0C6oc7ZWnprKH2zy1pHw=
SHA256 (gnome/libgnomecups-0.2.3.tar.bz2) = 4TDoCUKzht4ZooikwZT/Pb6RQDFbMemCBYyL/7tqHSk=
SIZE (gnome/libgnomecups-0.2.3.tar.bz2) = 357129

116
x11/gnome/libgnomecups/patches/patch-libgnomecups_gnome-cups-printer_c
View File

@ -1,116 +0,0 @@
$OpenBSD: patch-libgnomecups_gnome-cups-printer_c,v 1.3 2009/04/10 16:17:49 ajacoutot Exp $
* Parse ~/.cups/lpoptions.
* Check whether the printer URI starts with http://, ipp://, or smb:// to
test whether its local or not.
* Replace IPP_SET_PRINTER_ATTRIBUTES with CUPS_ADD_MODIFY_PRINTER.
* Fix PPD retrieval for printers picked up with cups browsing.
--- libgnomecups/gnome-cups-printer.c.orig Tue Jan 2 01:18:51 2007
+++ libgnomecups/gnome-cups-printer.c Wed Jan 30 14:59:24 2008
@@ -515,6 +515,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;
}
@@ -1030,8 +1034,11 @@ gnome_cups_printer_get_is_local (GnomeCupsPrinter *pri
{
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
@@ -1152,7 +1159,7 @@ gnome_cups_printer_get_ppd (GnomeCupsPrinter *printer)
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);
@@ -1288,9 +1295,14 @@ gnome_cups_printer_get_description (GnomeCupsPrinter *
g_return_val_if_fail (printer->details->description, "");
return printer->details->description;
-
}
+
+/* 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,
@@ -1306,7 +1318,11 @@ gnome_cups_printer_set_description (GnomeCupsPrinter *
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);
@@ -1338,8 +1354,12 @@ gnome_cups_printer_set_location (GnomeCupsPrinter *pri
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);
@@ -2018,5 +2038,28 @@ _gnome_cups_printer_get_host (GnomeCupsPrinter *printe
}
}
+ 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;
}

14
x11/gnome/libgnomecups/patches/patch-libgnomecups_gnome-cups-printer_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libgnomecups_gnome-cups-printer_h,v 1.3 2009/04/10 16:17:49 ajacoutot Exp $
Fix PPD retrieval for printers picked up with cups browsing.
--- libgnomecups/gnome-cups-printer.h.orig Tue Jan 29 23:50:53 2008
+++ libgnomecups/gnome-cups-printer.h Tue Jan 29 23:51:09 2008
@@ -188,6 +188,7 @@ void gnome_cups_ppd_file_release
/* 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

15
x11/gnome/libgnomecups/patches/patch-libgnomecups_gnome-cups-request_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-libgnomecups_gnome-cups-request_c,v 1.3 2009/04/10 16:17:49 ajacoutot Exp $
Do not warn on stderr in case of IPP_NOT_FOUND.
--- libgnomecups/gnome-cups-request.c.orig Tue Jan 29 23:51:24 2008
+++ libgnomecups/gnome-cups-request.c Tue Jan 29 23:51:59 2008
@@ -349,7 +349,7 @@ request_thread_main (GnomeCupsRequest *request,
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,

2
x11/gnome/libgnomecups/pkg/DESCR
View File

@ -1,2 +0,0 @@
This library wraps the CUPS API in a GLib fashion, so CUPS code can be
cleanly integrated with GLib code.

2
x11/gnome/libgnomecups/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/01/19 14:56:12 jasper Exp $
@lib lib/libgnomecups-1.0.so.${LIBgnomecups-1.0_VERSION}

93
x11/gnome/libgnomecups/pkg/PLIST
View File

@ -1,93 +0,0 @@
@comment $OpenBSD: PLIST,v 1.3 2009/04/10 16:17:49 ajacoutot Exp $
%%SHARED%%
include/libgnomecups-1/
include/libgnomecups-1/libgnomecups/
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/pkgconfig/
lib/pkgconfig/libgnomecups-1.0.pc
share/locale/ar/
share/locale/ar/LC_MESSAGES/
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/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/libgnomecups.mo
share/locale/en_CA/
share/locale/en_CA/LC_MESSAGES/
share/locale/en_CA/LC_MESSAGES/libgnomecups.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
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/
share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/libgnomecups.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/libgnomecups.mo
share/locale/hr/LC_MESSAGES/libgnomecups.mo
share/locale/hu/LC_MESSAGES/libgnomecups.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/libgnomecups.mo
share/locale/it/LC_MESSAGES/libgnomecups.mo
share/locale/ja/LC_MESSAGES/libgnomecups.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/libgnomecups.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/libgnomecups.mo
share/locale/nb/LC_MESSAGES/libgnomecups.mo
share/locale/ne/
share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/libgnomecups.mo
share/locale/nl/LC_MESSAGES/libgnomecups.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/libgnomecups.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
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/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/libgnomecups.mo
share/locale/sk/LC_MESSAGES/libgnomecups.mo
share/locale/sl/LC_MESSAGES/libgnomecups.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/libgnomecups.mo
share/locale/sr/LC_MESSAGES/libgnomecups.mo
share/locale/sr@Latn/
share/locale/sr@Latn/LC_MESSAGES/
share/locale/sr@Latn/LC_MESSAGES/libgnomecups.mo
share/locale/sv/LC_MESSAGES/libgnomecups.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
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/
share/locale/wa/LC_MESSAGES/
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