Date: Mon, 13 Feb 2023 16:04:02 GMT From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3a0cff7ea08c - main - x11-toolkits/gnocl: remove Message-ID: <202302131604.31DG42MT025508@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a0cff7ea08c5fc55c7b1bbab4641b2f60f767bb commit 3a0cff7ea08c5fc55c7b1bbab4641b2f60f767bb Author: Pietro Cerutti <gahr@FreeBSD.org> AuthorDate: 2023-02-13 15:59:51 +0000 Commit: Pietro Cerutti <gahr@FreeBSD.org> CommitDate: 2023-02-13 16:03:38 +0000 x11-toolkits/gnocl: remove The current version of the port doesn't build with recent compilers. There is a newer nightly on SourceForce, but it depends on gnome-vfs, which we ditched 2 years ago in 8e6f2e. --- MOVED | 1 + x11-toolkits/Makefile | 1 - x11-toolkits/gnocl/Makefile | 43 --------- x11-toolkits/gnocl/distinfo | 2 - x11-toolkits/gnocl/files/patch-src_Makefile | 29 ------ x11-toolkits/gnocl/files/patch-src_gnocl.c | 11 --- x11-toolkits/gnocl/files/patch-src_level.c | 10 --- x11-toolkits/gnocl/files/patch-src_parseMarkup.c | 11 --- x11-toolkits/gnocl/files/patch-src_parseOptions.c | 20 ----- x11-toolkits/gnocl/files/patch-src_pixBuf.c | 12 --- x11-toolkits/gnocl/files/patch-src_pixBufFilters.c | 92 ------------------- x11-toolkits/gnocl/files/patch-src_printDialog.c | 100 --------------------- x11-toolkits/gnocl/files/patch-src_splashScreen.c | 11 --- x11-toolkits/gnocl/files/patch-src_text.c | 20 ----- x11-toolkits/gnocl/pkg-descr | 7 -- 15 files changed, 1 insertion(+), 369 deletions(-) diff --git a/MOVED b/MOVED index 8095ef5a282d..b324f1908cf3 100644 --- a/MOVED +++ b/MOVED @@ -17764,3 +17764,4 @@ x11-toolkits/vdk||2023-01-30|Depends on EOLed gtk+20, not depended on in the por audio/libgpod-sharp||2023-02-01|Depends on EOLed gtk+20, not depended on in the ports tree x11/plasma5-kwayland-server|x11-wm/plasma5-kwin|2023-02-07|Reintegrated into x11-wm/plasma5-kwin finance/py-TA-Lib|finance/py-ta-lib|2023-02-12|Remove duplicate port +x11-toolkits/gnocl||2023-02-13|Fails to build, newer snapshot depends on a removed port diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index bec7ef8c041c..2f5a7bdf373a 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -18,7 +18,6 @@ SUBDIR += fxscintilla SUBDIR += gdl SUBDIR += girara - SUBDIR += gnocl SUBDIR += gnome-pty-helper SUBDIR += gnustep-back SUBDIR += gnustep-gui diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile deleted file mode 100644 index fb4765051f9c..000000000000 --- a/x11-toolkits/gnocl/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -PORTNAME= gnocl -DISTVERSION= ${BASE_VERSION}-${NIGHTLY_BUILD} -PORTREVISION= 3 -CATEGORIES= x11-toolkits devel -MASTER_SITES= SF/${PORTNAME}/Gnocl-Nightly-Build/ - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= GTK+ and Gnome extension for Tcl -WWW= https://gnocl.org/ - -LICENSE= TclTk -LICENSE_NAME= Tcl/Tk License -LICENSE_FILE= ${WRKSRC}/license.terms -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -LIB_DEPENDS= libcanberra.so:audio/libcanberra \ - libnotify.so:devel/libnotify \ - libgtkimageview.so:x11-toolkits/gtkimageview - -USES= gmake gnome pkgconfig tar:bzip2 tcl -USE_GNOME= gtk20 libglade2 -USE_LDCONFIG= yes -CFLAGS+= -I${TCL_INCLUDEDIR} -L${TCL_LIBDIR} - -BASE_VERSION= 0.9.96 -NIGHTLY_BUILD= 31-08-13 - -WRKSRC= ${WRKDIR}/${PORTNAME}-${BASE_VERSION} -BUILD_WRKSRC= ${WRKSRC}/src -INSTALL_WRKSRC= ${BUILD_WRKSRC} - -BASEDIR= lib/${PORTNAME}${BASE_VERSION} -PLIST_FILES= ${BASEDIR}/${PORTNAME}.so \ - ${BASEDIR}/pkgIndex.tcl - -post-patch: - ${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|; \ - s|%%LOCALBASE%%|${LOCALBASE}|; \ - s|%%SHORT_TCL_VER%%|${TCL_VER:S/.//}|' \ - ${BUILD_WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|\[info library\]|${STAGEDIR}${PREFIX}/lib|; s|tclsh|${TCLSH}|g;' ${BUILD_WRKSRC}/install.tcl - -.include <bsd.port.mk> diff --git a/x11-toolkits/gnocl/distinfo b/x11-toolkits/gnocl/distinfo deleted file mode 100644 index 53866f0b81ab..000000000000 --- a/x11-toolkits/gnocl/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index ee1d8ed3baaa..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_Makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- 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) - - ADDCFLAGS := -DVERSION=\"$(VERSION)\" \ -- -DUSE_TCL_STUBS $(shell pkg-config --cflags gtk+-2.0) \ -- -I/usr/include/tcl$(TCL_VERSION) \ -- -I/usr/include/libglade-2.0 -+ -DUSE_TCL_STUBS $(shell pkg-config --cflags gtk+-2.0 libglade-2.0 gtk+-unix-print-2.0) \ -+ -I%%LOCALBASE%%/include/tcl$(TCL_VERSION) - - LIBS := $(shell pkg-config \ -- --libs gtk+-2.0 libglade-2.0 libnotify) \ -- -ltclstub$(TCL_VERSION) -+ --libs gtk+-2.0 gtk+-unix-print-2.0 libglade-2.0 libnotify) \ -+ %%LOCALBASE%%/lib/libtclstub%%SHORT_TCL_VER%%.a - - 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 deleted file mode 100644 index c5272a6a2602..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_gnocl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index d1d9efd9c4bd..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_level.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index ca7d108ad2bc..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_parseMarkup.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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_parseOptions.c b/x11-toolkits/gnocl/files/patch-src_parseOptions.c deleted file mode 100644 index ab6cea7b787c..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_parseOptions.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/parseOptions.c.orig 2013-02-01 12:17:16.000000000 +0100 -+++ src/parseOptions.c 2013-02-01 12:18:01.000000000 +0100 -@@ -413,7 +413,7 @@ - int gnoclOptAngle ( Tcl_Interp *interp, GnoclOption *opt, GObject *obj, Tcl_Obj **ret ) - { - -- return ; -+ return 0; - - const char *txt[] = { "up", "down", "left", "right", "none", NULL }; - const int types[] = { GTK_ARROW_UP, GTK_ARROW_DOWN, GTK_ARROW_LEFT, GTK_ARROW_RIGHT, GTK_ARROW_NONE}; -@@ -443,7 +443,7 @@ - int gnoclOptArrow ( Tcl_Interp *interp, GnoclOption *opt, GObject *obj, Tcl_Obj **ret ) - { - -- return ; -+ return 0; - - const char *txt[] = { "up", "down", "left", "right", "none", NULL }; - const int types[] = { GTK_ARROW_UP, GTK_ARROW_DOWN, GTK_ARROW_LEFT, GTK_ARROW_RIGHT, GTK_ARROW_NONE}; diff --git a/x11-toolkits/gnocl/files/patch-src_pixBuf.c b/x11-toolkits/gnocl/files/patch-src_pixBuf.c deleted file mode 100644 index 8a9637f471d4..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_pixBuf.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/pixBuf.c.orig 2013-01-31 10:52:21.000000000 +0100 -+++ src/pixBuf.c 2013-02-01 14:22:55.000000000 +0100 -@@ -90,6 +90,9 @@ - /* Key for automated pixbuf updating and destruction */ - static const cairo_user_data_key_t pixbuf_key; - -+void gdk_pixbuf_get_pixel ( GdkPixbuf * pixbuf, guint x, guint y , guchar * r, guchar * g, guchar * b, guchar * a ); -+void gdk_pixbuf_set_pixel ( GdkPixbuf * pixbuf, guint32 pixel, guint x, guint y ); -+ - - /** - \brief This function will initialize new cairo context with contents of diff --git a/x11-toolkits/gnocl/files/patch-src_pixBufFilters.c b/x11-toolkits/gnocl/files/patch-src_pixBufFilters.c deleted file mode 100644 index f24936f6269d..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_pixBufFilters.c +++ /dev/null @@ -1,92 +0,0 @@ ---- src/pixBufFilters.c.orig 2013-02-01 12:20:37.000000000 +0100 -+++ src/pixBufFilters.c 2013-02-01 12:25:56.000000000 +0100 -@@ -16,6 +16,8 @@ - - #define RADS(var) var * G_PI / 180 - -+static void countItems ( int j, int a ); -+static void filter_convolute ( GdkPixbuf *pixbuf, int matrix [3][3] ); - - typedef struct accumulator - { -@@ -319,7 +321,7 @@ - gint p = 0; - gint r, g, b, a; - -- g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) ); -+ g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 ); - - /* this method prevents a deferencing error */ - k = gdk_pixbuf_get_width ( pixbuf ); -@@ -384,7 +386,7 @@ - gint p = 0; - gint r, g, b, a; - -- g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) ); -+ g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ) , -1 ); - - /* this method prevents a deferencing error */ - k = gdk_pixbuf_get_width ( pixbuf ); -@@ -430,7 +432,7 @@ - gint p = 0; - gint r, g, b, a; - -- g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) ); -+ g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 ); - - /* this method prevents a deferencing error */ - k = gdk_pixbuf_get_width ( pixbuf ); -@@ -502,7 +504,7 @@ - gint p = 0; - guchar r, g, b, a; - -- g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) ); -+ g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 ); - - /* this method prevents a deferencing error */ - k = gdk_pixbuf_get_width ( pixbuf ); -@@ -559,7 +561,7 @@ - - g_print ( "%s 1\n", __FUNCTION__ ); - -- g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) ); -+ g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 ); - - g_print ( "%s 2\n", __FUNCTION__ ); - -@@ -629,7 +631,7 @@ - gint p = 0; - gint r, g, b, a; - -- g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) ); -+ g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 ); - - /* this method prevents a deferencing error */ - k = gdk_pixbuf_get_width ( pixbuf ); -@@ -675,7 +677,7 @@ - gint p = 0; - guchar r, g, b, a; - -- g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) ); -+ g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 ); - - /* this method prevents a deferencing error */ - k = gdk_pixbuf_get_width ( pixbuf ); -@@ -717,7 +719,7 @@ - gint p = 0; - guchar r, g, b, a; - -- g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) ); -+ g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 ); - - /* this method prevents a deferencing error */ - k = gdk_pixbuf_get_width ( pixbuf ); -@@ -777,7 +779,7 @@ - \note - \todo - **/ --void gnoclPixBufFilters ( Tcl_Interp *interp, GdkPixbuf *pixbuf, int objc, Tcl_Obj * const objv[] ) -+int gnoclPixBufFilters ( Tcl_Interp *interp, GdkPixbuf *pixbuf, int objc, Tcl_Obj * const objv[] ) - { - - //GdkPixbuf *pixbuf = NULL; diff --git a/x11-toolkits/gnocl/files/patch-src_printDialog.c b/x11-toolkits/gnocl/files/patch-src_printDialog.c deleted file mode 100644 index b205d1fd24e3..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_printDialog.c +++ /dev/null @@ -1,100 +0,0 @@ ---- 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 ); -@@ -64,67 +65,28 @@ - - GtkPrintCapabilities capability; - -- switch ( *opt->propName ) -- { -- -- case 'page-set': -- { -- capability = GTK_PRINT_CAPABILITY_PAGE_SET; -- } -- break; -- case 'copies': -- { -- capability = GTK_PRINT_CAPABILITY_COPIES; -- } -- break; -- case 'collate': -- { -- capability = GTK_PRINT_CAPABILITY_COLLATE ; -- } -- break; -- case 'reverse': -- { -- capability = GTK_PRINT_CAPABILITY_REVERSE ; -- } -- break; -- case 'scale': -- { -- capability = GTK_PRINT_CAPABILITY_SCALE ; -- } -- break; -- case 'generate-pdf': -- { -- capability = GTK_PRINT_CAPABILITY_GENERATE_PDF ; -- } -- break; -- case 'generate-ps': -- { -- capability = GTK_PRINT_CAPABILITY_GENERATE_PS ; -- } -- break; -- case 'preview': -- { -- capability = GTK_PRINT_CAPABILITY_PREVIEW ; -- } -- break; -- case 'number-up': -- { -- capability = GTK_PRINT_CAPABILITY_NUMBER_UP ; -- } -- break; -- case ' number-up-layout': -- { -- capability = GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT ; -- } -- break; -- default: -- { -- // assert( 0 ); -- 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_splashScreen.c b/x11-toolkits/gnocl/files/patch-src_splashScreen.c deleted file mode 100644 index 96ce5c0bf525..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_splashScreen.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/splashScreen.c.orig 2013-02-01 12:39:35.000000000 +0100 -+++ src/splashScreen.c 2013-02-01 12:40:09.000000000 +0100 -@@ -83,7 +83,7 @@ - /** - \brief - **/ --static int getParams ( int objc, Tcl_Obj * const objv[], gchar *f, gchar *c, gchar *p, gchar *w ) -+static void getParams ( int objc, Tcl_Obj * const objv[], gchar *f, gchar *c, gchar *p, gchar *w ) - { - if ( objc < 5 ) - { diff --git a/x11-toolkits/gnocl/files/patch-src_text.c b/x11-toolkits/gnocl/files/patch-src_text.c deleted file mode 100644 index 3976b5eb8550..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_text.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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, "" ); -- -- return TCL_OK; - } - - diff --git a/x11-toolkits/gnocl/pkg-descr b/x11-toolkits/gnocl/pkg-descr deleted file mode 100644 index f4eb4c7a7826..000000000000 --- a/x11-toolkits/gnocl/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Gnocl implements a Tcl binding to the Gtk+ programming libraries for the rapid -development of graphical user interfaces. Designed to work with Tcl in a manner -consistent with the general syntax and command naming conventions of Tcl, Gnocl -provides a robust alternative to Tk for those developers which wish to develop -applications that seamlessly integrated into the Gnome desktop environment -without having to first familiarize themselves with the intricacies of the Gtk+ -libraries and its dependencies.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302131604.31DG42MT025508>