diff options
author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-09-17 08:36:00 +0000 |
---|---|---|
committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-09-17 08:36:00 +0000 |
commit | 627739127c5762d5ec28902187dfde06df5ae70f (patch) | |
tree | d9c009693ac08e4caa2edcf7c3469c5714c8a1df /x11-toolkits/gnocl | |
parent | - Fix build with fox-1.7 (diff) |
- Update to 0.9.96.31.08.13
Notes
Notes:
svn path=/head/; revision=327457
Diffstat (limited to 'x11-toolkits/gnocl')
-rw-r--r-- | x11-toolkits/gnocl/Makefile | 2 | ||||
-rw-r--r-- | x11-toolkits/gnocl/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/gnocl/files/patch-src_Makefile | 13 | ||||
-rw-r--r-- | x11-toolkits/gnocl/files/patch-src_gnocl.c | 11 | ||||
-rw-r--r-- | x11-toolkits/gnocl/files/patch-src_level.c | 10 | ||||
-rw-r--r-- | x11-toolkits/gnocl/files/patch-src_parseMarkup.c | 18 | ||||
-rw-r--r-- | x11-toolkits/gnocl/files/patch-src_printDialog.c | 58 | ||||
-rw-r--r-- | x11-toolkits/gnocl/files/patch-src_text.c | 15 |
8 files changed, 85 insertions, 46 deletions
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile index 1c11d3eb84cb..2684be70cedf 100644 --- a/x11-toolkits/gnocl/Makefile +++ b/x11-toolkits/gnocl/Makefile @@ -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 diff --git a/x11-toolkits/gnocl/distinfo b/x11-toolkits/gnocl/distinfo index 10f6a97225c7..53866f0b81ab 100644 --- a/x11-toolkits/gnocl/distinfo +++ b/x11-toolkits/gnocl/distinfo @@ -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 diff --git a/x11-toolkits/gnocl/files/patch-src_Makefile b/x11-toolkits/gnocl/files/patch-src_Makefile index c6c92964f387..ee1d8ed3baaa 100644 --- a/x11-toolkits/gnocl/files/patch-src_Makefile +++ b/x11-toolkits/gnocl/files/patch-src_Makefile @@ -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 \ diff --git a/x11-toolkits/gnocl/files/patch-src_gnocl.c b/x11-toolkits/gnocl/files/patch-src_gnocl.c new file mode 100644 index 000000000000..c5272a6a2602 --- /dev/null +++ b/x11-toolkits/gnocl/files/patch-src_gnocl.c @@ -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 }, + diff --git a/x11-toolkits/gnocl/files/patch-src_level.c b/x11-toolkits/gnocl/files/patch-src_level.c new file mode 100644 index 000000000000..d1d9efd9c4bd --- /dev/null +++ b/x11-toolkits/gnocl/files/patch-src_level.c @@ -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[] = + { diff --git a/x11-toolkits/gnocl/files/patch-src_parseMarkup.c b/x11-toolkits/gnocl/files/patch-src_parseMarkup.c index 6e17f33be5ab..ca7d108ad2bc 100644 --- a/x11-toolkits/gnocl/files/patch-src_parseMarkup.c +++ b/x11-toolkits/gnocl/files/patch-src_parseMarkup.c @@ -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 ) + { diff --git a/x11-toolkits/gnocl/files/patch-src_printDialog.c b/x11-toolkits/gnocl/files/patch-src_printDialog.c index 85e357af95a5..b205d1fd24e3 100644 --- a/x11-toolkits/gnocl/files/patch-src_printDialog.c +++ b/x11-toolkits/gnocl/files/patch-src_printDialog.c @@ -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 ) ); diff --git a/x11-toolkits/gnocl/files/patch-src_text.c b/x11-toolkits/gnocl/files/patch-src_text.c index 268517798ca9..3976b5eb8550 100644 --- a/x11-toolkits/gnocl/files/patch-src_text.c +++ b/x11-toolkits/gnocl/files/patch-src_text.c @@ -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, "" ); |