SF.net SVN: gar:[22369] csw/mgar/pkg/gtk2/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Mon Nov 4 10:54:05 CET 2013
Revision: 22369
http://gar.svn.sourceforge.net/gar/?rev=22369&view=rev
Author: guengel
Date: 2013-11-04 09:54:03 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
gtk2/trunk: Bumped to 2.24.22.
Modified Paths:
--------------
csw/mgar/pkg/gtk2/trunk/Makefile
csw/mgar/pkg/gtk2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch
csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch
csw/mgar/pkg/gtk2/trunk/files/0003-Adjust-hardcoded-path-to-opt-csw-share.patch
csw/mgar/pkg/gtk2/trunk/files/0004-Initialize-pap_status_t-with-PAPI_OK-instead-of-NULL.patch
Removed Paths:
-------------
csw/mgar/pkg/gtk2/trunk/files/0000-Add-update-modules-cmd-line-option.patch
csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile 2013-11-04 09:12:18 UTC (rev 22368)
+++ csw/mgar/pkg/gtk2/trunk/Makefile 2013-11-04 09:54:03 UTC (rev 22369)
@@ -1,10 +1,10 @@
# $Id$
NAME = gtk2
-VERSION = 2.24.14
+VERSION = 2.24.22
GARTYPE = v2
-GARCOMPILER = SOS12U3
+GARCOMPILER = GNU
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
DESCRIPTION = GTK+, the multiplatform X11 toolkit for GUI development
@@ -26,21 +26,18 @@
EXPANDVARS = CSWgtk2.postinstall
# This makes the tests work in the first place
-PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch
+#PATCHFILES += 0002-Use-absolute-path-to-Xvfb.patch
-# This disables a check that I wasn't able to fix
-#
-# This bug has already been reported by Tim Mooney
-# https://bugzilla.gnome.org/show_bug.cgi?id=643338
-PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch
-
# This patch adds a command line option `--update-modules` to
# gtk-query-immodules-2.0 which has the default location of
# gtk.immodules hardcoded and takes 32/64bit ISAs into account.
-PATCHFILES += 0000-Add-update-modules-cmd-line-option.patch
+PATCHFILES += 0001-Add-update-modules-cmd-line-option.patch
-PATCHFILES += 0000-Adjust-hardcoded-path-to-opt-csw-share.patch
+PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch
+PATCHFILES += 0003-Adjust-hardcoded-path-to-opt-csw-share.patch
+PATCHFILES += 0004-Initialize-pap_status_t-with-PAPI_OK-instead-of-NULL.patch
+
PACKAGES += CSWgtk2
SPKG_DESC_CSWgtk2 = $(DESCRIPTION)
# Catchall
@@ -241,8 +238,7 @@
CONFIGURE_ARGS += --enable-xkb
CONFIGURE_ARGS += --enable-xinerama
CONFIGURE_ARGS += --enable-cups
-CONFIGURE_ARGS += --enable-introspection=no
-CONFIGURE_ARGS-64 += --disable-cups
+CONFIGURE_ARGS += --disable-introspection
CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
include gar/category.mk
Modified: csw/mgar/pkg/gtk2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gtk2/trunk/checksums 2013-11-04 09:12:18 UTC (rev 22368)
+++ csw/mgar/pkg/gtk2/trunk/checksums 2013-11-04 09:54:03 UTC (rev 22369)
@@ -1 +1 @@
-e2c16f119ed624893ecfc3775930ae4c gtk+-2.24.14.tar.xz
+5fbbfb7637bbd571a572a2dae0e736d2 gtk+-2.24.22.tar.xz
Deleted: csw/mgar/pkg/gtk2/trunk/files/0000-Add-update-modules-cmd-line-option.patch
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/0000-Add-update-modules-cmd-line-option.patch 2013-11-04 09:12:18 UTC (rev 22368)
+++ csw/mgar/pkg/gtk2/trunk/files/0000-Add-update-modules-cmd-line-option.patch 2013-11-04 09:54:03 UTC (rev 22369)
@@ -1,96 +0,0 @@
-From 1ae7e710bce003ff900de41947f8ae5e57fc6409 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <rafisol at opencsw.org>
-Date: Sat, 17 Dec 2011 16:54:29 +0100
-Subject: [PATCH] Add --update-modules cmd line option
-
----
- gtk/queryimmodules.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 49 insertions(+), 4 deletions(-)
-
-diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
-index 5369c7f..223e8ee 100644
---- a/gtk/queryimmodules.c
-+++ b/gtk/queryimmodules.c
-@@ -23,6 +23,7 @@
-
- #include <glib.h>
- #include <glib/gprintf.h>
-+#include <glib/gstdio.h>
- #include <gmodule.h>
-
- #include <errno.h>
-@@ -30,6 +31,8 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#include <fcntl.h>
-+#include <stdlib.h>
-
- #ifdef USE_LA_MODULES
- #define SOEXT ".la"
-@@ -164,16 +167,58 @@ query_module (const char *dir, const char *name)
- int main (int argc, char **argv)
- {
- char *cwd;
-- int i;
-+ int i, fd, retval;
- char *path;
-+ char *gtk_immodules;
- gboolean error = FALSE;
-
-+ /*
-+ * Quick an dirty hack.
-+ *
-+ * This will allow us to create the gtk.immodules in the default
-+ * place by providing `--update-modules' as cmd line argument,
-+ * without worrying where this might be when calling
-+ * gtk-query-immodules-2.0 from a postinstall script.
-+ *
-+ * The basic idea is to redirect STDOUT to the default file and then
-+ * let the normal flow of the program continue like there was no cmd
-+ * line argument. Be aware, that this only works when no other cmd
-+ * line options were passed.
-+ */
-+ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 )
-+ {
-+ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-+ if ( fd == -1 )
-+ {
-+ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules);
-+ exit(1);
-+ }
-+
-+ if ( dup2(fd, STDOUT_FILENO) == -1 )
-+ {
-+ g_fprintf(stderr, "Unable to redirect STDOUT.\n");
-+ exit(1);
-+ }
-+
-+ /*
-+ * cheat, to make it think there are no arguments given
-+ */
-+ argc = 1;
-+ }
-+
-+
- g_printf ("# GTK+ Input Method Modules file\n"
- "# Automatically generated file, do not edit\n"
-- "# Created by %s from gtk+-%d.%d.%d\n"
-- "#\n",
-+ "# Created by %s from gtk+-%d.%d.%d (OpenCSW Patch)\n"
-+ "#\n"
-+ "#\n"
-+ "# DefaultFile = %s\n"
-+ "# DefaultDir = %s\n",
- argv[0],
-- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
-+ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL),
-+ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", NULL));
-
-
- if (argc == 1) /* No arguments given */
---
-1.7.6.1
-
Deleted: csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch 2013-11-04 09:12:18 UTC (rev 22368)
+++ csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch 2013-11-04 09:54:03 UTC (rev 22369)
@@ -1,25 +0,0 @@
-From 11d563a5e79f88b3564d2dce5d5c5c12ab52d788 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <rafisol at opencsw.org>
-Date: Sun, 11 Dec 2011 10:50:20 +0100
-Subject: [PATCH] Use absolute path to Xvfb
-
----
- gtk/tests/Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in
-index 4f8c6e3..6de5031 100644
---- a/gtk/tests/Makefile.in
-+++ b/gtk/tests/Makefile.in
-@@ -391,7 +391,7 @@ TEST_PROGS = testing liststore treestore treeview treeview-scrolling \
- ### testing rules
-
- # Xvfb based test rules
--XVFB = Xvfb -ac -noreset -screen 0 800x600x16
-+XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
- XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
- 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
- 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
---
-1.7.6.1
-
Added: csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch (rev 0)
+++ csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch 2013-11-04 09:54:03 UTC (rev 22369)
@@ -0,0 +1,109 @@
+From 12dfaa24cf6f26d7293d68e5b0ad3c1ce1504ea6 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Mon, 4 Nov 2013 08:43:08 +0100
+Subject: [PATCH] Add --update-modules cmd line option
+
+---
+ gtk/queryimmodules.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 51 insertions(+), 4 deletions(-)
+
+diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
+index a91ea47..69d89df 100644
+--- a/gtk/queryimmodules.c
++++ b/gtk/queryimmodules.c
+@@ -23,6 +23,7 @@
+
+ #include <glib.h>
+ #include <glib/gprintf.h>
++#include <glib/gstdio.h>
+ #include <gmodule.h>
+
+ #include <errno.h>
+@@ -30,6 +31,8 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#include <fcntl.h>
++#include <stdlib.h>
+
+ #ifdef USE_LA_MODULES
+ #define SOEXT ".la"
+@@ -162,27 +165,71 @@ query_module (const char *dir, const char *name, GString *contents)
+ int main (int argc, char **argv)
+ {
+ char *cwd;
+- int i;
++ int i, fd, retval;
+ char *path;
++ char *gtk_immodules;
+ gboolean error = FALSE;
+ gchar *cache_file = NULL;
+ gint first_file = 1;
+ GString *contents;
+
++
++
+ if (argc > 1 && strcmp (argv[1], "--update-cache") == 0)
+ {
+ cache_file = gtk_rc_get_im_module_file ();
+ first_file = 2;
+ }
+
++ /*
++ * Quick an dirty hack.
++ *
++ * This will allow us to create the gtk.immodules in the default
++ * place by providing `--update-modules' as cmd line argument,
++ * without worrying where this might be when calling
++ * gtk-query-immodules-2.0 from a postinstall script.
++ *
++ * The basic idea is to redirect STDOUT to the default file and then
++ * let the normal flow of the program continue like there was no cmd
++ * line argument. Be aware, that this only works when no other cmd
++ * line options were passed.
++ */
++ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 )
++ {
++ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
++ if ( fd == -1 )
++ {
++ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules);
++ exit(1);
++ }
++
++ if ( dup2(fd, STDOUT_FILENO) == -1 )
++ {
++ g_fprintf(stderr, "Unable to redirect STDOUT.\n");
++ exit(1);
++ }
++
++ /*
++ * cheat, to make it think there are no arguments given
++ */
++ first_file = 2;
++ }
++
++
+ contents = g_string_new ("");
+ g_string_append_printf (contents,
+ "# GTK+ Input Method Modules file\n"
+ "# Automatically generated file, do not edit\n"
+- "# Created by %s from gtk+-%d.%d.%d\n"
+- "#\n",
++ "# Created by %s from gtk+-%d.%d.%d (OpenCSW Patch)\n"
++ "#\n"
++ "#\n"
++ "# DefaultFile = %s\n"
++ "# DefaultDir = %s\n",
+ argv[0],
+- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
++ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL),
++ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", NULL));
+
+ if (argc == first_file) /* No file arguments given */
+ {
+--
+1.8.3.4
+
Added: csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch (rev 0)
+++ csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch 2013-11-04 09:54:03 UTC (rev 22369)
@@ -0,0 +1,25 @@
+From 8f4ed5e421c668213e57da64ee73eb4de443b727 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Mon, 4 Nov 2013 08:55:28 +0100
+Subject: [PATCH] Use absolute path to Xvfb
+
+---
+ tests/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 8b937c9..a1b316e 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -934,7 +934,7 @@ TEST_PROGS =
+ ### testing rules
+
+ # Xvfb based test rules
+-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
+ XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
+ 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
+ 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
+--
+1.8.3.4
+
Added: csw/mgar/pkg/gtk2/trunk/files/0003-Adjust-hardcoded-path-to-opt-csw-share.patch
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/0003-Adjust-hardcoded-path-to-opt-csw-share.patch (rev 0)
+++ csw/mgar/pkg/gtk2/trunk/files/0003-Adjust-hardcoded-path-to-opt-csw-share.patch 2013-11-04 09:54:03 UTC (rev 22369)
@@ -0,0 +1,25 @@
+From 3ddf5d81beeea22d058406e61416448f74c39c1f Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Mon, 4 Nov 2013 09:05:26 +0100
+Subject: [PATCH] Adjust hardcoded path to /opt/csw/share
+
+---
+ demos/testpixbuf-color.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/demos/testpixbuf-color.c b/demos/testpixbuf-color.c
+index 003f333..851a15b 100644
+--- a/demos/testpixbuf-color.c
++++ b/demos/testpixbuf-color.c
+@@ -6,7 +6,7 @@
+
+ #include <gtk/gtk.h>
+
+-#define ICC_PROFILE "/usr/share/color/icc/bluish.icc"
++#define ICC_PROFILE "/opt/csw/share/color/icc/bluish.icc"
+ #define ICC_PROFILE_SIZE 3966
+
+ static gboolean
+--
+1.8.3.4
+
Added: csw/mgar/pkg/gtk2/trunk/files/0004-Initialize-pap_status_t-with-PAPI_OK-instead-of-NULL.patch
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/0004-Initialize-pap_status_t-with-PAPI_OK-instead-of-NULL.patch (rev 0)
+++ csw/mgar/pkg/gtk2/trunk/files/0004-Initialize-pap_status_t-with-PAPI_OK-instead-of-NULL.patch 2013-11-04 09:54:03 UTC (rev 22369)
@@ -0,0 +1,25 @@
+From 4f10d808cf516fb2068445d59a5410e56ff9c122 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Mon, 4 Nov 2013 10:21:49 +0100
+Subject: [PATCH] Initialize pap_status_t with PAPI_OK instead of NULL
+
+---
+ modules/printbackends/papi/gtkprintbackendpapi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/printbackends/papi/gtkprintbackendpapi.c b/modules/printbackends/papi/gtkprintbackendpapi.c
+index d349010..3f81f7f 100644
+--- a/modules/printbackends/papi/gtkprintbackendpapi.c
++++ b/modules/printbackends/papi/gtkprintbackendpapi.c
+@@ -352,7 +352,7 @@ gtk_print_backend_papi_print_stream (GtkPrintBackend *print_backend,
+ const gchar *title;
+ char *prtnm = NULL;
+ GtkPrintDuplex val;
+- papi_status_t pstatus = NULL;
++ papi_status_t pstatus = PAPI_OK;
+ papi_attribute_t **attrs = NULL;
+ papi_job_ticket_t *ticket = NULL;
+
+--
+1.8.3.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list