head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.4 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.2 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.4.0.50 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.48 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.46 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.44 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.42 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.40 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.38 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.36 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.34 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.32 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.30 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.28 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.26 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.24 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.22 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.20 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.18 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2012.02.09.12.11.30; author drochner; state dead; branches; next 1.6; 1.6 date 2012.02.01.18.23.05; author drochner; state Exp; branches; next 1.5; 1.5 date 2012.01.29.10.56.44; author drochner; state Exp; branches; next 1.4; 1.4 date 2002.11.15.17.12.14; author wiz; state dead; branches; next 1.3; 1.3 date 2002.04.06.15.48.55; author dmcmahill; state Exp; branches; next 1.2; 1.2 date 2002.03.30.20.01.39; author dmcmahill; state Exp; branches; next 1.1; 1.1 date 2002.03.24.20.34.37; author dmcmahill; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.03.24.20.34.37; author dmcmahill; state Exp; branches; next ; desc @@ 1.7 log @update to 2.24.10 changes: -printing fix was integrated -more minor fixes @ text @$NetBSD: patch-ak,v 1.6 2012/02/01 18:23:05 drochner Exp $ gnome bug #543520 --- modules/printbackends/cups/gtkprintbackendcups.c.orig 2012-01-24 19:38:37.000000000 +0000 +++ modules/printbackends/cups/gtkprintbackendcups.c @@@@ -485,7 +485,7 @@@@ cups_print_cb (GtkPrintBackendCups *prin typedef struct { GtkCupsRequest *request; - GtkPrinterOptionSet *options; + GtkPrinterCups *printer; } CupsOptionsData; static void @@@@ -495,9 +495,13 @@@@ add_cups_options (const gchar *key, { CupsOptionsData *data = (CupsOptionsData *) user_data; GtkCupsRequest *request = data->request; - GtkPrinterOptionSet *options = data->options; - GtkPrinterOption *option = NULL; + GtkPrinterCups *printer = data->printer; + gboolean custom_value = FALSE; gchar *new_value = NULL; + gint i; + + if (!key || !value) + return; if (!g_str_has_prefix (key, "cups-")) return; @@@@ -505,17 +509,37 @@@@ add_cups_options (const gchar *key, if (strcmp (value, "gtk-ignore-value") == 0) return; - option = gtk_printer_option_set_lookup (options, key); - key = key + strlen ("cups-"); - /* Add "Custom." prefix to custom values */ - if (value && option && - !gtk_printer_option_has_choice (option, value)) - new_value = g_strdup_printf ("Custom.%s", value); + if (printer && printer->ppd_file) + { + ppd_coption_t *coption; + gboolean found = FALSE; + gboolean custom_values_enabled = FALSE; + + coption = ppdFindCustomOption (printer->ppd_file, key); + if (coption && coption->option) + { + for (i = 0; i < coption->option->num_choices; i++) + { + /* Are custom values enabled ? */ + if (g_str_equal (coption->option->choices[i].choice, "Custom")) + custom_values_enabled = TRUE; + + /* Is the value among available choices ? */ + if (g_str_equal (coption->option->choices[i].choice, value)) + found = TRUE; + } + + if (custom_values_enabled && !found) + custom_value = TRUE; + } + } - if (new_value) + /* Add "Custom." prefix to custom values. */ + if (custom_value) { + new_value = g_strdup_printf ("Custom.%s", value); gtk_cups_request_encode_option (request, key, new_value); g_free (new_value); } @@@@ -536,9 +560,6 @@@@ gtk_print_backend_cups_print_stream (Gtk CupsOptionsData *options_data; GtkCupsRequest *request; GtkPrintSettings *settings; - GtkPrinterOptionSet *options; - GtkPrintCapabilities capabilities; - GtkPageSetup *page_setup; const gchar *title; char printer_absolute_uri[HTTP_MAX_URI]; @@@@ -547,8 +568,6 @@@@ gtk_print_backend_cups_print_stream (Gtk cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job)); settings = gtk_print_job_get_settings (job); - capabilities = cups_printer_get_capabilities (GTK_PRINTER (cups_printer)); - page_setup = gtk_printer_get_default_page_size (GTK_PRINTER (cups_printer)); request = gtk_cups_request_new_with_username (NULL, GTK_CUPS_POST, @@@@ -586,16 +605,10 @@@@ gtk_print_backend_cups_print_stream (Gtk IPP_TAG_NAME, "job-name", NULL, title); - options = cups_printer_get_options (GTK_PRINTER (cups_printer), settings, page_setup, capabilities); - options_data = g_new0 (CupsOptionsData, 1); options_data->request = request; - options_data->options = options; - + options_data->printer = cups_printer; gtk_print_settings_foreach (settings, add_cups_options, options_data); - - g_object_unref (page_setup); - g_object_unref (options); g_free (options_data); ps = g_new0 (CupsPrintStreamData, 1); @@@@ -4606,7 +4619,12 @@@@ cups_printer_get_default_page_size (GtkP return NULL; option = ppdFindOption (ppd_file, "PageSize"); + if (option == NULL) + return NULL; + size = ppdPageSize (ppd_file, option->defchoice); + if (size == NULL) + return NULL; return create_page_setup (ppd_file, size); } @ 1.6 log @replace the patch for the printing problem by the official upstream one, bump PKGREV @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @update to 2.24.9 changes: bugfixes pkgsrc note: backed out upstream change for cups Custom print options, it causes crashes at least with firefox, see gnome bug #543520 @ text @d3 1 a3 2 revert upstream commit 8170436e61ea68c713d75ad374d22c3261be9203, it causes firefox crashes (see gnome bug #543520) d7 1 a7 3 @@@@ -483,44 +483,22 @@@@ cups_print_cb (GtkPrintBackendCups *prin GDK_THREADS_LEAVE (); } d9 2 a10 2 -typedef struct { - GtkCupsRequest *request; d12 3 a14 2 -} CupsOptionsData; - d16 1 a16 3 add_cups_options (const gchar *key, const gchar *value, gpointer user_data) d18 2 a19 2 - CupsOptionsData *data = (CupsOptionsData *) user_data; - GtkCupsRequest *request = data->request; d22 7 a28 2 - gchar *new_value = NULL; + GtkCupsRequest *request = user_data; d32 1 a32 1 d35 1 a35 1 - d37 1 a37 1 d44 25 a68 1 - d70 9 a78 15 - { - gtk_cups_request_encode_option (request, key, new_value); - g_free (new_value); - } - else - gtk_cups_request_encode_option (request, key, value); + gtk_cups_request_encode_option (request, key, value); } static void @@@@ -533,12 +511,8 @@@@ gtk_print_backend_cups_print_stream (Gtk { GtkPrinterCups *cups_printer; CupsPrintStreamData *ps; - CupsOptionsData *options_data; d87 1 a87 1 @@@@ -547,8 +521,6 @@@@ gtk_print_backend_cups_print_stream (Gtk d96 1 a96 1 @@@@ -586,18 +558,8 @@@@ gtk_print_backend_cups_print_stream (Gtk d102 2 a103 2 - options_data = g_new0 (CupsOptionsData, 1); - options_data->request = request; d106 2 a107 1 - gtk_print_settings_foreach (settings, add_cups_options, options_data); d111 2 a112 4 - g_free (options_data); - + gtk_print_settings_foreach (settings, add_cups_options, request); + d114 13 a126 2 ps->callback = callback; ps->user_data = user_data; @ 1.4 log @Update to 2.0.8. Changes: * Fix typo in io-gif.c that broke loading GIFS [Akira Tagoh] * Improve redraws when scrolling on Win32 [Tor Lillqvist] * Fix problem with RENDER and XFree86-4.1 [Owen Taylor, Jamie Zawinski] * Fix problem with GtkImage placement [Owen, Sven Neumann, Soeren Sandmann] * Updated translation (el) * Fix some memory leaks in gdk-pixbuf [Sven Neumann] * Pixbuf loader fixes [Federico Mena Quintero, Elliot Lee] * Support depth 8 StaticColor in GdkRGB [Matthias Clasen] * Win32 fixes and improvements [Tor Lillqvist] - Keyboard handling fixes [Florian Dugent] - Fixes for building and running on Cygwin [Masahiro Sakai] - Fix gdk_window_scroll(), other GdkWindow fixes - Misc bug and build fixes [Soren Andersen, Florent, Tim Evans, J. Ali Harlow, Andreas Holzmann, Iwasa Kazmi] * Improve tracking of toplevel focus state [Owen] * XIM input method fixes [Takuro Ashie, HideToshi Tajima] * Fix the longstanding problem with <,> keys and XIM [Owen Taylor] * Fix GtkIMContextSimple for us-intl keyboards [Alexandre Oliva] * GtkIMContextSimple updates for Eastern Europe [Stanislav Brabec] * Fix the "key bindings randomly stop working" problem [Sebastian Ritau] * GtkTextView fixes [Gustavo Giraldez, Padraig O'Briain, Shivaram Upadhyayula] * GtkTreeView bugfixes [Jonathan Blandford, Kristian Rietveld] - Various memleak, ref counting fixes [Jonathan, Jorn Baayen, Daniel Elstner, Morten Welinder] - gtk_tree_selection_selected_foreach now immediately returns if the model is being changed [Havoc Pennington] - Fix evil bug with insertions to GtkTreeModelSort [Hans Petter Jansson] * GtkCombo fixes [Marco Pesenti Gritti, Zimler Attila, Matthias, Owen] * Fix 64-bit problem with GtkFundamentalType [Ross Alexander, Manish Singh] * New and updated translations (am,be,bg,ca,cs,da,de,el,es,el,fa,fr,hi,hu, ja,ko,lv,ms,nl,no,pl,pt,pt_BR,ru,sk,sv,vi,zh_TW) * Many miscellaneous bug fixes Other contributors: Jacob Berkman, Alvert Chin, Chema Celorio, David L. Cooper II, Brent Fox, Tim Janik, Marco Pesenti Gritti, Alex Larsson, Zenith Lau, Thomas Leonard, Gaute Lindkvist, Paolo Maggi, Andy Wingo, Jami Pekannen, Joshua N Pritikin, Soeren Sandmann, Vitaly Tishkov, Morten Welinder @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $ d3 95 a97 10 --- gtk/Makefile.am.orig Fri Mar 8 01:36:45 2002 +++ gtk/Makefile.am @@@@ -65,6 +65,7 @@@@ # we use the general approach here libgtkincludedir = $(includedir)/gtk-2.0/gtk LDFLAGS = @@STRIP_BEGIN@@ \ + @@LDFLAGS@@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic \ -rpath $(libdir) \ @ 1.3 log @update to gtk2+-2.0.2 This is a bug fix release. Overview of Changes in GTK+ 2.0.2 ================================= * GtkTreeView cursor movement fixes [Kristian Rietveld] * GtkTreeModelSort iterator stamp fixes [Kristian Rietveld] @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to gtk2-2.0.1 Overview of Changes in GTK+ 2.0.1 ================================= * GtkTreeView fixes and performance improvements [Kristian Rietveld, Jonathan Blandford, Mike Piepe, Dave Camp] * GtkTextView fixes [Havoc Pennington] * Fix problems with accelerators on Solaris [Padraig O'Briain] * Some fixes for key bindings on keypad keys [Owen Taylor] * Fix problem with RENDER use on big endian machines [Owen Taylor, with help from Tuomas Kuosmanen] * Win32 fixes, especially dashed line drawing [Tor Lillqvist, Hans Breuer] * Compile with -D_REENTRANT when appropriate [Sven Numann] * Compiler warning cleanups [Erwann Chenede] * Fix handling of font-name XSETTING [Richard Hestilow] * Make linux-fb backend compile again [Carlo E. Prelz, Alex Larsson] * Fix problems with inappropriate menu scroll arrows [Owen] * Stock icon improvements [Jakub Steiner, Tuomas] * Much work on pixbuf loader robustness [Matthias Clasen] * Documentation improvements [Matthias, Vitaly Tiskkov] * Fix some crashes in GtkWindow accelerator handling code [Dave Camp, Matt Wilson] * Misc bug fixes Other contributors: Jacob Berkman, Dennis Björklund, Seth Burgess, Murray Cumming, Johan Dahlin, John Ellis, Kang Jeong-He, James Henstridge, Richard Hult, Thomas Leonard, LEE Sau Dan, Alexey A. Malyshev, Mark McLoughlin, Michael Meeks, Sven Neumann, Andras Salamon, Soeren Sandmann, Dan Winship, Yao Zhang @ text @d3 10 a12 11 --- gtk/Makefile.in.orig Fri Mar 29 18:51:26 2002 +++ gtk/Makefile.in @@@@ -667,7 +667,7 @@@@ bin_PROGRAMS = gtk-query-immodules-2.0 gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) -gtk_query_immodules_2_0_LDADD = $(LDADDS) +gtk_query_immodules_2_0_LDADD = @@LDFLAGS@@ $(LDADDS) gtk_query_immodules_2_0_SOURCES = queryimmodules.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @ 1.1 log @Initial revision @ text @d3 4 a6 8 --- demos/gtk-demo/Makefile.in.orig Sun Mar 17 15:03:23 2002 +++ demos/gtk-demo/Makefile.in @@@@ -215,6 +215,7 @@@@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/@@gdktargetlib@@ \ $(top_builddir)/gtk/@@gtktargetlib@@ \ + @@LDFLAGS@@ \ @@STRIP_END@@ d8 3 d12 2 @ 1.1.1.1 log @import gtk2-2.0.0 The Gimp Tool Kit. GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites. @ text @@