Date: Tue, 2 Nov 2010 22:00:26 GMT From: Alexey Shuvaev <shuvaev@physik.uni-wuerzburg.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/151893: x11-toolkits/slgtk : update to 0.7.6 Message-ID: <201011022200.oA2M0Pwu020996@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/151893; it has been noted by GNATS. From: Alexey Shuvaev <shuvaev@physik.uni-wuerzburg.de> To: bug-followup@FreeBSD.org Cc: Koop Mast <kwm@rainbow-runner.nl> Subject: Re: ports/151893: x11-toolkits/slgtk : update to 0.7.6 Date: Tue, 2 Nov 2010 21:58:55 +0100 --9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Attached is slightly modified patch that ensures that the newly added demo features are working out-of-the-box. NOTE, that files/patch-src_slirprc-gtk.sl along with the files/ directory are REMOVED, it is not needed anymore. Apart from this, thanks, good job, update is approved! Alexey. --9jxsPFA5p3P2qPhR Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="slgtk-0.7.6.diff" diff -ruN slgtk.orig/Makefile slgtk/Makefile --- slgtk.orig/Makefile 2010-04-17 16:08:49.000000000 +0200 +++ slgtk/Makefile 2010-11-02 21:35:50.000000000 +0100 @@ -6,8 +6,7 @@ # PORTNAME= slgtk -PORTVERSION= 0.7.5 -PORTREVISION= 4 +PORTVERSION= 0.7.6 CATEGORIES= x11-toolkits MASTER_SITES= ftp://space.mit.edu/pub/cxc/modules/slgtk/ @@ -25,7 +24,7 @@ OPTIONS= FITS "Install gdk-pixbuf FITS image loader" off -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-ccdebug SLGTK_DEVEL_BUILD=true @@ -41,8 +40,9 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|\.\.|${EXAMPLESDIR}| ; s|"examples"|"."|' \ - ${WRKSRC}/examples/main.sl + @${REINPLACE_CMD} -e 's|"examples"|"."| ; s|/examples|| ; \ + s|"\.\."|"${EXAMPLESDIR}"|' \ + ${WRKSRC}/examples/main.sl ${WRKSRC}/examples/socket.sl @${REINPLACE_CMD} -e '/rm -f devel/d ; /ln -sf @prefix@ devel/d' \ ${WRKSRC}/Makefile.in @@ -55,6 +55,7 @@ ${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${EXAMPLESDIR}/images ${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/examples/gtkplug ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.sl ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/packages/wdisplay.sl ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/images/gtk-logo-rgb.gif ${EXAMPLESDIR}/images @@ -62,4 +63,4 @@ ${INSTALL_DATA} ${WRKSRC}/images/stars.fits ${EXAMPLESDIR}/images .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN slgtk.orig/distinfo slgtk/distinfo --- slgtk.orig/distinfo 2009-05-02 18:13:27.000000000 +0200 +++ slgtk/distinfo 2010-11-02 20:09:16.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (slgtk-0.7.5.tar.gz) = 99a2b4e313daebb53218b9af41874d4f -SHA256 (slgtk-0.7.5.tar.gz) = 06f390bd58c404693a152077c39f2116c7782e42e13aca9423787ecd463066a4 -SIZE (slgtk-0.7.5.tar.gz) = 1014634 +SHA256 (slgtk-0.7.6.tar.gz) = ed9545d45b6ef40ec09593b287d48812d6ea4bc0d4ec54fa2fe7c8a4bcbcc402 +SIZE (slgtk-0.7.6.tar.gz) = 1625646 diff -ruN slgtk.orig/files/patch-src_slirprc-gtk.sl slgtk/files/patch-src_slirprc-gtk.sl --- slgtk.orig/files/patch-src_slirprc-gtk.sl 2009-11-28 21:06:25.000000000 +0100 +++ slgtk/files/patch-src_slirprc-gtk.sl 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/slirprc-gtk.sl.orig 2009-09-27 23:31:51.000000000 -0400 -+++ src/slirprc-gtk.sl 2009-09-27 23:32:06.000000000 -0400 -@@ -308,6 +308,8 @@ accepts_null_args["g_list_append"] = [1] - gtk_widget_get_window % prefer my version, which returns - % bin_window for GtkLayout - -+gtk_widget_get_allocation -+ - gtk_accel_group_activate % gtk/gtkaccelgroup.h: "internal" funcs - gtk_accel_group_get_entry - gtk_accel_group_lock_entry diff -ruN slgtk.orig/pkg-plist slgtk/pkg-plist --- slgtk.orig/pkg-plist 2009-05-02 18:13:27.000000000 +0200 +++ slgtk/pkg-plist 2010-11-02 21:13:11.000000000 +0100 @@ -1,11 +1,13 @@ bin/imdisplay %%FITS%%lib/gtk-2.0/2.10.0/loaders/fitsi_loader.so %%FITS%%lib/gtk-2.0/2.10.0/loaders/fitsi_loader.so.0.7.0 +lib/slang/v2/modules/gif-module.so +lib/slang/v2/modules/gif-module.so.0.5.2 lib/slang/v2/modules/gtk-module.so lib/slang/v2/modules/gtkextra-module.so lib/slang/v2/modules/libslgtk.so lib/slang/v2/modules/libslgtk.so.0 -lib/slang/v2/modules/libslgtk.so.0.7.5 +lib/slang/v2/modules/libslgtk.so.0.7.6 %%PORTDOCS%%%%DOCSDIR%%/slgtk.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttonbox.sl @@ -27,6 +29,7 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gprompt.sl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gprompt_example.sl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtkmainloop.sl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtkplug %%PORTEXAMPLES%%%%EXAMPLESDIR%%/handlebox.sl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/gtk-logo-rgb.gif %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/test.xpm @@ -67,10 +70,13 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wdisplay.sl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/window.sl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wmhints.sl +share/slsh/local-packages/animio.sl +share/slsh/local-packages/gif.sl share/slsh/local-packages/gprompt.sl share/slsh/local-packages/gtk.sl share/slsh/local-packages/gtkextra.sl share/slsh/local-packages/gtkplot.sl +share/slsh/local-packages/help/giffuns.hlp share/slsh/local-packages/help/slgtkfun.hlp share/slsh/local-packages/imdisplay.sl share/slsh/local-packages/rgbselect.sl --9jxsPFA5p3P2qPhR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011022200.oA2M0Pwu020996>