Date: Tue, 17 Sep 2013 08:36:00 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327457 - in head/x11-toolkits/gnocl: . files Message-ID: <201309170836.r8H8a1NM088525@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Sep 17 08:36:00 2013 New Revision: 327457 URL: http://svnweb.freebsd.org/changeset/ports/327457 Log: - Update to 0.9.96.31.08.13 Added: head/x11-toolkits/gnocl/files/patch-src_gnocl.c (contents, props changed) head/x11-toolkits/gnocl/files/patch-src_level.c (contents, props changed) Modified: head/x11-toolkits/gnocl/Makefile head/x11-toolkits/gnocl/distinfo head/x11-toolkits/gnocl/files/patch-src_Makefile head/x11-toolkits/gnocl/files/patch-src_parseMarkup.c head/x11-toolkits/gnocl/files/patch-src_printDialog.c head/x11-toolkits/gnocl/files/patch-src_text.c Modified: head/x11-toolkits/gnocl/Makefile ============================================================================== --- head/x11-toolkits/gnocl/Makefile Tue Sep 17 08:31:20 2013 (r327456) +++ head/x11-toolkits/gnocl/Makefile Tue Sep 17 08:36:00 2013 (r327457) @@ -24,7 +24,7 @@ USE_LDCONFIG= yes CFLAGS+= -I${TCL_INCLUDEDIR} -L${TCL_LIBDIR} BASE_VERSION= 0.9.96 -NIGHTLY_BUILD= 31-01-13 +NIGHTLY_BUILD= 31-08-13 WRKSRC= ${WRKDIR}/${PORTNAME}-${BASE_VERSION} BUILD_WRKSRC= ${WRKSRC}/src Modified: head/x11-toolkits/gnocl/distinfo ============================================================================== --- head/x11-toolkits/gnocl/distinfo Tue Sep 17 08:31:20 2013 (r327456) +++ head/x11-toolkits/gnocl/distinfo Tue Sep 17 08:36:00 2013 (r327457) @@ -1,2 +1,2 @@ -SHA256 (gnocl-0.9.96-31-01-13.tar.bz2) = a3031f8077e9e0cebf55b5b889ba725c44fcf33a144c4106140acb83ba1aa2c6 -SIZE (gnocl-0.9.96-31-01-13.tar.bz2) = 1038185 +SHA256 (gnocl-0.9.96-31-08-13.tar.bz2) = 255c922faef91e0d810d10b18dffbdc4a75cbd3416ccd4fd06a32d5938575c29 +SIZE (gnocl-0.9.96-31-08-13.tar.bz2) = 1052570 Modified: head/x11-toolkits/gnocl/files/patch-src_Makefile ============================================================================== --- head/x11-toolkits/gnocl/files/patch-src_Makefile Tue Sep 17 08:31:20 2013 (r327456) +++ head/x11-toolkits/gnocl/files/patch-src_Makefile Tue Sep 17 08:36:00 2013 (r327457) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2013-01-31 10:52:21.000000000 +0100 -+++ src/Makefile 2013-02-01 14:35:59.000000000 +0100 +--- src/Makefile.orig 2013-08-31 12:36:08.000000000 +0200 ++++ src/Makefile 2013-09-17 10:00:25.000000000 +0200 @@ -16,13 +16,12 @@ TCL_VERSION := $(shell echo 'puts $$tcl_version' | tclsh) @@ -18,3 +18,12 @@ GTK_OBJ := \ aboutDialog.o \ +@@ -72,8 +71,6 @@ + labelEntry.o \ + language.o \ + layout.o \ +- ./level/gtklevel.o \ +- level.o \ + linkButton.o \ + keyfile.o \ + menu.o \ Added: head/x11-toolkits/gnocl/files/patch-src_gnocl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gnocl/files/patch-src_gnocl.c Tue Sep 17 08:36:00 2013 (r327457) @@ -0,0 +1,11 @@ +--- src/gnocl.c.orig 2013-09-17 10:11:31.000000000 +0200 ++++ src/gnocl.c 2013-09-17 10:11:50.000000000 +0200 +@@ -669,7 +669,7 @@ + /* non-gtk widgets */ + { "spinner", gnoclSpinnerCmd }, + { "dial", gnoclDialCmd }, +- { "level", gnoclLevelCmd }, ++// { "level", gnoclLevelCmd }, + { "tickerTape", gnoclTickerTapeCmd }, + { "richTextToolBar", gnoclRichTextToolBarCmd }, + Added: head/x11-toolkits/gnocl/files/patch-src_level.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gnocl/files/patch-src_level.c Tue Sep 17 08:36:00 2013 (r327457) @@ -0,0 +1,10 @@ +--- src/level.c.orig 2013-09-05 15:33:47.000000000 +0200 ++++ src/level.c 2013-09-05 15:33:52.000000000 +0200 +@@ -12,7 +12,6 @@ + **/ + + #include "gnocl.h" +-#include "./level/gtklevel.h" + + static GnoclOption levelOptions[] = + { Modified: head/x11-toolkits/gnocl/files/patch-src_parseMarkup.c ============================================================================== --- head/x11-toolkits/gnocl/files/patch-src_parseMarkup.c Tue Sep 17 08:31:20 2013 (r327456) +++ head/x11-toolkits/gnocl/files/patch-src_parseMarkup.c Tue Sep 17 08:36:00 2013 (r327457) @@ -1,11 +1,11 @@ ---- src/parseMarkup.c.orig 2013-02-01 12:41:08.000000000 +0100 -+++ src/parseMarkup.c 2013-02-01 12:41:30.000000000 +0100 -@@ -27,6 +27,8 @@ - #include <stdio.h> - #include <string.h> - -+static void applyTags ( GtkTextBuffer *buffer, GtkTextMark *tagStart, GtkTextMark *tagEnd ); -+ - /* list to hold names of applied tags */ +--- src/parseMarkup.c.orig 2013-08-31 12:36:08.000000000 +0200 ++++ src/parseMarkup.c 2013-09-17 10:09:40.000000000 +0200 +@@ -29,6 +29,8 @@ static GSList *tagList = NULL; + ++static void applyTags ( GtkTextBuffer *buffer, GtkTextIter *iter ); ++ + /* remove range of characters from string */ + char * strcremove ( char *str, char *dest, int first, int last ) + { Modified: head/x11-toolkits/gnocl/files/patch-src_printDialog.c ============================================================================== --- head/x11-toolkits/gnocl/files/patch-src_printDialog.c Tue Sep 17 08:31:20 2013 (r327456) +++ head/x11-toolkits/gnocl/files/patch-src_printDialog.c Tue Sep 17 08:36:00 2013 (r327457) @@ -1,14 +1,14 @@ ---- src/printDialog.c.orig 2013-01-31 10:52:21.000000000 +0100 -+++ src/printDialog.c 2013-02-01 14:25:27.000000000 +0100 -@@ -20,6 +20,7 @@ - #include "string.h" - #include <assert.h> - #include <gtk-unix-print-2.0/gtk/gtkprinter.h> +--- src/printDialog.c.orig 2013-09-17 10:02:23.000000000 +0200 ++++ src/printDialog.c 2013-09-17 10:14:13.000000000 +0200 +@@ -17,6 +17,7 @@ + **/ + + #include "gnocl.h" +#include <gtk-unix-print-2.0/gtk/gtkprintunixdialog.h> /* static declarations */ static int gnoclOptPageSetup ( Tcl_Interp *interp, GnoclOption *opt, GObject *obj, Tcl_Obj **ret ); -@@ -63,67 +64,28 @@ +@@ -64,67 +65,28 @@ GtkPrintCapabilities capability; @@ -73,28 +73,28 @@ - - } - -+ if ( ! strcmp ( opt->propName, "page-set" ) ) -+ capability = GTK_PRINT_CAPABILITY_PAGE_SET; -+ else if ( ! strcmp ( opt->propName, "copies" ) ) -+ capability = GTK_PRINT_CAPABILITY_COPIES; -+ else if ( ! strcmp ( opt->propName, "collate" ) ) -+ capability = GTK_PRINT_CAPABILITY_COLLATE; -+ else if ( ! strcmp ( opt->propName, "reverse" ) ) -+ capability = GTK_PRINT_CAPABILITY_REVERSE ; -+ else if ( ! strcmp ( opt->propName, "scale" ) ) -+ capability = GTK_PRINT_CAPABILITY_SCALE ; -+ else if ( ! strcmp ( opt->propName, "generate-pdf" ) ) -+ capability = GTK_PRINT_CAPABILITY_GENERATE_PDF ; -+ else if ( ! strcmp ( opt->propName, "generate-ps" ) ) -+ capability = GTK_PRINT_CAPABILITY_GENERATE_PS ; -+ else if ( ! strcmp ( opt->propName, "preview" ) ) -+ capability = GTK_PRINT_CAPABILITY_PREVIEW ; -+ else if ( ! strcmp ( opt->propName, "number-up" ) ) -+ capability = GTK_PRINT_CAPABILITY_NUMBER_UP ; -+ else if ( ! strcmp ( opt->propName, "number-up-layout" ) ) -+ capability = GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT ; -+ else -+ return TCL_ERROR; ++ if ( ! strcmp ( opt->propName, "page-set" ) ) ++ capability = GTK_PRINT_CAPABILITY_PAGE_SET; ++ else if ( ! strcmp ( opt->propName, "copies" ) ) ++ capability = GTK_PRINT_CAPABILITY_COPIES; ++ else if ( ! strcmp ( opt->propName, "collate" ) ) ++ capability = GTK_PRINT_CAPABILITY_COLLATE; ++ else if ( ! strcmp ( opt->propName, "reverse" ) ) ++ capability = GTK_PRINT_CAPABILITY_REVERSE ; ++ else if ( ! strcmp ( opt->propName, "scale" ) ) ++ capability = GTK_PRINT_CAPABILITY_SCALE ; ++ else if ( ! strcmp ( opt->propName, "generate-pdf" ) ) ++ capability = GTK_PRINT_CAPABILITY_GENERATE_PDF ; ++ else if ( ! strcmp ( opt->propName, "generate-ps" ) ) ++ capability = GTK_PRINT_CAPABILITY_GENERATE_PS ; ++ else if ( ! strcmp ( opt->propName, "preview" ) ) ++ capability = GTK_PRINT_CAPABILITY_PREVIEW ; ++ else if ( ! strcmp ( opt->propName, "number-up" ) ) ++ capability = GTK_PRINT_CAPABILITY_NUMBER_UP ; ++ else if ( ! strcmp ( opt->propName, "number-up-layout" ) ) ++ capability = GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT ; ++ else ++ return TCL_ERROR; GtkPrintCapabilities tmp = gtk_print_unix_dialog_get_manual_capabilities ( GTK_PRINT_UNIX_DIALOG ( obj ) ); Modified: head/x11-toolkits/gnocl/files/patch-src_text.c ============================================================================== --- head/x11-toolkits/gnocl/files/patch-src_text.c Tue Sep 17 08:31:20 2013 (r327456) +++ head/x11-toolkits/gnocl/files/patch-src_text.c Tue Sep 17 08:36:00 2013 (r327457) @@ -1,6 +1,15 @@ ---- src/text.c.orig 2013-02-01 12:40:27.000000000 +0100 -+++ src/text.c 2013-02-01 12:40:44.000000000 +0100 -@@ -2971,8 +2971,6 @@ +--- src/text.c.orig 2013-08-31 12:36:08.000000000 +0200 ++++ src/text.c 2013-09-17 10:07:27.000000000 +0200 +@@ -3267,7 +3267,7 @@ + if ( tag == NULL ) + { + +- return TCL_ERROR; ++ return; + } + + +@@ -3299,8 +3299,6 @@ sprintf ( s1, "" ); sprintf ( s2, "" );
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309170836.r8H8a1NM088525>