Attachment 149561 Details for Bug 195155 – Patch to fix gsch2pcb utility

[patch] Patch to fix gsch2pcb utility

cad_geda.fix_gsch2pcb.diff (text/plain), 2.09 KB, created by Tobias Rehbein on 2014-11-18 19:25:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Rehbein

Created: 2014-11-18 19:25:06 UTC

Size: 2.09 KB

patch

obsolete

>diff -ruN cad/geda.orig/Makefile cad/geda/Makefile
>--- cad/geda.orig/Makefile	2014-11-18 18:26:14.697755365 +0100
>+++ cad/geda/Makefile	2014-11-18 19:57:45.474376672 +0100
>@@ -17,7 +17,8 @@
> 
> LIB_DEPENDS=	libstroke.so:${PORTSDIR}/devel/libstroke \
> 		libguile.so:${PORTSDIR}/lang/guile
>-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
>+RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk\
>+		m4>=1.4.11:${PORTSDIR}/devel/m4
> 
> USES=		desktop-file-utils gettext gmake libtool pathfix perl5 \
> 		pkgconfig python:run shared-mime-info shebangfix
>@@ -29,6 +30,7 @@
> USE_GNOME=	gtk20
> USE_PERL5=	run
> GNU_CONFIGURE=	yes
>+CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4
> CONFIGURE_ARGS=	--with-libstroke=${LOCALBASE}
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>diff -ruN cad/geda.orig/files/patch-utils__src__gsch2pcb.c cad/geda/files/patch-utils__src__gsch2pcb.c
>--- cad/geda.orig/files/patch-utils__src__gsch2pcb.c	1970-01-01 01:00:00.000000000 +0100
>+++ cad/geda/files/patch-utils__src__gsch2pcb.c	2014-11-18 18:53:39.482643412 +0100
>@@ -0,0 +1,18 @@
>+--- utils/src/gsch2pcb.c.orig	2013-08-18 08:44:47.000000000 +0200
>++++ utils/src/gsch2pcb.c	2014-11-18 18:53:20.303642614 +0100
>+@@ -1397,13 +1397,13 @@
>+   pcbdata_path = g_getenv ("PCBDATA");  /* do not free return value */
>+   if (pcbdata_path != NULL) {
>+     /* If PCBDATA is set, use the value */
>+-    m4_pcbdir = g_strconcat (pcbdata_path, "/pcb/m4", NULL);
>++    m4_pcbdir = g_strconcat (pcbdata_path, "/m4", NULL);
>+   } else {
>+     /* Use the default value passed in from the configure script
>+      * instead of trying to hard code a value which is very
>+      * likely wrong
>+      */
>+-    m4_pcbdir = g_strconcat (PCBDATADIR, "/pcb/m4", NULL);
>++    m4_pcbdir = g_strconcat (PCBDATADIR, "/m4", NULL);
>+   }
>+ 
>+   default_m4_pcbdir = g_strdup (m4_pcbdir);
>diff -ruN cad/geda.orig/pkg-plist cad/geda/pkg-plist
>--- cad/geda.orig/pkg-plist	2014-11-18 18:26:14.697755365 +0100
>+++ cad/geda/pkg-plist	2014-11-18 20:15:44.543303309 +0100
>@@ -2341,3 +2341,4 @@
> share/mime/application/x-geda-schematic.xml
> share/mime/application/x-geda-symbol.xml
> share/mime/packages/libgeda.xml
>+@dir %%DATADIR%%/sym/local

Actions: View | Diff

Attachments on bug 195155: 149561 | 149562