Attachment #212719 for bug #245068

View | Details | Raw Unified | Return to bug 245068
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	lepton-eda
PORTVERSION=	1.9.10
DISTVERSIONSUFFIX=	-20200319
CATEGORIES=	cad

MAINTAINER=	graahnul.grom@gmail.com


USES=		autoreconf desktop-file-utils gettext-tools gnome \
		groff:build libtool localbase makeinfo pathfix perl5 \
		pkgconfig shared-mime-info shebangfix
USE_GITHUB=	yes
USE_GNOME=	cairo gtk20
USE_LDCONFIG=	yes

SHEBANG_FILES=	utils/scripts/lepton-pcb_backannotate \
		utils/scripts/lepton-archive.py \
		utils/scripts/gschupdate \
		utils/scripts/gsymupdate \
		utils/scripts/lepton-pcb_backannotate \
		utils/scripts/lepton-refdes_renum \
		utils/scripts/lepton-symfix
		examples/lightning_detector/bom

PORTEXAMPLES=	examples/*


NLS_CONFIGURE_ENABLE=	nls
NLS_USES=		gettext-runtime

post-patch:
	${REINPLACE_CMD} -e \
		's,\$$(docdir)/examples,\$$(datadir)/examples/lepton-eda,' \
		${WRKSRC}/examples/Makefile.am \
		${WRKSRC}/examples/RF_Amp/Makefile.am \
		${WRKSRC}/examples/TwoStageAmp/Makefile.am \
		${WRKSRC}/examples/gTAG/Makefile.am \
		${WRKSRC}/examples/lightning_detector/Makefile.am

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)cad/lepton-eda/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1570203233	1	TIMESTAMP = 1585112125
2	SHA256 (lepton-eda-lepton-eda-1.9.9-20191003_GH0.tar.gz) = 13448d91ae17ab8c5e5cbba56c5a4e6a7cc3b3cb392280cb4d218f50891469d7	2	SHA256 (lepton-eda-lepton-eda-1.9.10-20200319_GH0.tar.gz) = 271fac1424a963117dfe687846c8d884bc70ed8bf3a50c72ad5cc00741a5c403
3	SIZE (lepton-eda-lepton-eda-1.9.9-20191003_GH0.tar.gz) = 8361951	3	SIZE (lepton-eda-lepton-eda-1.9.10-20200319_GH0.tar.gz) = 8386076




--- build-tools/icon-theme-installer.orig	2019-10-03 20:45:55 UTC
+++ build-tools/icon-theme-installer
@@ -103,13 +103,13 @@ if test -z "$INSTALL_BASE_DIR"; then
 	exit 1
 fi
 
-if test ! -x `echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '`; then
-	echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
+if test -z "$MKINSTALLDIRS_EXEC"; then
+	echo "\$MKINSTALLDIRS_EXEC is not set. Pass it with the -m command line option"
 	exit 1
 fi
 
-if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
-	echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+if test -z "$INSTALL_DATA_EXEC"; then
+	echo "\$INSTALL_DATA_EXEC' is not set. Pass it with the -x command line option"
 	exit 1
 fi
 




--- docs/scheme-api/Makefile.am.orig	2019-10-09 16:39:51 UTC
+++ docs/scheme-api/Makefile.am
@@ -4,10 +4,8 @@ AM_MAKEINFOHTMLFLAGS = --css-ref=lepton-
 
 EXTRA_DIST = lepton-scheme.css
 
-html-local:
+all: all-am html
 	$(MKDIR_P) $(builddir)/lepton-scheme.html/
 	cp -fv $(srcdir)/lepton-scheme.css $(builddir)/lepton-scheme.html/
 
-all-local: html
-
 install-data-local: install-html




--- examples/Makefile.am.orig	2019-02-23 08:55:55 UTC
+++ examples/Makefile.am
@@ -1,9 +1,9 @@
 
 SUBDIRS = gTAG lightning_detector RF_Amp TwoStageAmp
 
-exampledir = $(docdir)/examples/
+exampledir = $(datadir)/examples/lepton-eda/
 
-example_DATA = README 
+example_DATA = README
 
 EXTRA_DIST = ChangeLog ChangeLog-1.0 $(example_DATA)
 
@@ -16,7 +16,7 @@ ChangeLog: $(top_builddir)/stamp-git
 	) > $@
 endif HAVE_GIT_REPO
 
-MOSTLYCLEANFILES = *.log core FILE *~ 
-CLEANFILES = *.log core FILE *~ 
+MOSTLYCLEANFILES = *.log core FILE *~
+CLEANFILES = *.log core FILE *~
 DISTCLEANFILES = *.log core FILE *~
 MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog

Lines 1-11 Link Here

(-)cad/lepton-eda/files/patch-examples_RF__Amp_Makefile.am (-11 lines)
1	--- examples/RF_Amp/Makefile.am.orig 2019-02-23 08:55:55 UTC
2	+++ examples/RF_Amp/Makefile.am
3	@@ -1,7 +1,7 @@
4
5	SUBDIRS = model sym
6
7	-exampledir = $(docdir)/examples/RF_Amp/
8	+exampledir = $(datadir)/examples/lepton-eda/RF_Amp/
9
10	example_DATA = 5980-2396E.pdf MSA-2643.cir MSA-2643.sch \
11	Q1.cir Q1.sch Q2.cir Q2.sch README Simulation.cmd gafrc




--- examples/RF_Amp/model/Makefile.am.orig	2019-02-23 08:55:55 UTC
+++ examples/RF_Amp/model/Makefile.am
@@ -1,7 +1,7 @@
-exampledir = $(docdir)/examples/RF_Amp/model/
+exampledir = $(datadir)/examples/lepton-eda/RF_Amp/model/
 
 example_DATA = BJTM1_Q1.mod BJTM1_Q2.mod DiodeM1_Q1.mod DiodeM1_Q2.mod \
-             DiodeM2_Q1.mod DiodeM2_Q2.mod DiodeM3_Q1.mod DiodeM3_Q2.mod 
+             DiodeM2_Q1.mod DiodeM2_Q2.mod DiodeM3_Q1.mod DiodeM3_Q2.mod
 
 EXTRA_DIST = $(example_DATA)
 

Lines 1-8 Link Here

(-)cad/lepton-eda/files/patch-examples_RF__Amp_sym_Makefile.am (-8 lines)
1	--- examples/RF_Amp/sym/Makefile.am.orig 2019-02-23 08:55:55 UTC
2	+++ examples/RF_Amp/sym/Makefile.am
3	@@ -1,4 +1,4 @@
4	-exampledir = $(docdir)/examples/RF_Amp/sym/
5	+exampledir = $(datadir)/examples/lepton-eda/RF_Amp/sym/
6
7	example_DATA = BJT_Model.sym Q_Model.sym spice-subcircuit-IO-1.sym \
8	spice-subcircuit-LL-1.sym

Lines 1-8 Link Here

(-)cad/lepton-eda/files/patch-examples_TwoStageAmp_Makefile.am (-8 lines)
1	--- examples/TwoStageAmp/Makefile.am.orig 2019-02-23 08:55:55 UTC
2	+++ examples/TwoStageAmp/Makefile.am
3	@@ -1,4 +1,4 @@
4	-exampledir = $(docdir)/examples/TwoStageAmp/
5	+exampledir = $(datadir)/examples/lepton-eda/TwoStageAmp/
6
7	nobase_example_DATA = \
8	Simulation.cmd TwoStageAmp.sch spice.netlist gafrc \

Lines 1-8 Link Here

(-)cad/lepton-eda/files/patch-examples_gTAG_Makefile.am (-8 lines)
1	--- examples/gTAG/Makefile.am.orig 2019-02-23 08:55:55 UTC
2	+++ examples/gTAG/Makefile.am
3	@@ -1,4 +1,4 @@
4	-exampledir = $(docdir)/examples/gTAG/
5	+exampledir = $(datadir)/examples/lepton-eda/gTAG/
6
7	example_DATA = 7414-1.sym attribs gafrc copyleft.sym crdist.sh \
8	cy7c64603-52nc.sym gTAG-consio.ps gTAG-consio.sch \




--- examples/lightning_detector/Makefile.am.orig	2019-02-23 08:55:55 UTC
+++ examples/lightning_detector/Makefile.am
@@ -1,11 +1,11 @@
-exampledir = $(docdir)/examples/lightning_detector/
+exampledir = $(datadir)/examples/lepton-eda/lightning_detector/
 
 nobase_example_DATA = \
 	bom bom.readme lightning.net lightning.pcb lightning.sch \
 	lightning.sch.bom gafrc \
 	sym/2N4401.sym sym/2N4403.sym
 
-EXTRA_DIST = $(nobase_example_DATA) 
+EXTRA_DIST = $(nobase_example_DATA)
 
 MOSTLYCLEANFILES = gschem.log *~
 CLEANFILES = gschem.log *~




--- liblepton/include/liblepton/geda_list.h.orig	2019-10-03 20:45:55 UTC
+++ liblepton/include/liblepton/geda_list.h
@@ -1,7 +1,8 @@
-/* gEDA - GPL Electronic Design Automation
- * libgeda - gEDA's library
+/* Lepton EDA library
  * Copyright (C) 1998-2010 Ales Hvezda
  * Copyright (C) 2007-2010 Peter Clifton
+ * Copyright (C) 2011-2015 gEDA Contributors
+ * Copyright (C) 2017-2019 Lepton EDA Contributors
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -56,6 +57,9 @@ void geda_list_add_glist( GedaList *list
 void geda_list_remove( GedaList *list, gpointer item );
 /*void geda_list_remove_glist( GedaList *list, GList *items ); */ /* Undemanded as yet */
 void geda_list_remove_all( GedaList *list );
+void geda_list_move_item( GedaList* list, gpointer item, gint newpos );
+
+
 
 /*const GList *geda_list_get_glist( GedaList *list ); */
 #define geda_list_get_glist(list) (list->glist)

Lines 1-11 Link Here

(-)cad/lepton-eda/files/patch-liblepton_scheme_geda_log-rotate.scm (-11 lines)
1	--- liblepton/scheme/geda/log-rotate.scm.orig 2019-10-03 20:45:55 UTC
2	+++ liblepton/scheme/geda/log-rotate.scm
3	@@ -44,7 +44,7 @@
4	;; FIXME This should be obtained from the code that decides where to
5	;; create and populate log files.
6	(define (log-directory)
7	- (string-append (user-config-dir) file-name-separator-string "logs"))
8	+ (string-append (user-cache-dir) file-name-separator-string "logs"))
9
10	;;;; get-log-toolname path
11	;;

Lines 1-10 Link Here

(-)cad/lepton-eda/files/patch-liblepton_scheme_geda_os.scm (-10 lines)
1	--- liblepton/scheme/geda/os.scm.orig 2019-10-03 20:45:55 UTC
2	+++ liblepton/scheme/geda/os.scm
3	@@ -49,6 +49,7 @@
4	(define-public sys-config-dirs %sys-config-dirs)
5	(define-public user-data-dir %user-data-dir)
6	(define-public user-config-dir %user-config-dir)
7	+(define-public user-cache-dir %user-cache-dir)
8
9	(define-public expand-env-variables
10	;; Only compile regular expression once




--- liblepton/src/geda_list.c.orig	2019-10-03 20:45:55 UTC
+++ liblepton/src/geda_list.c
@@ -1,7 +1,8 @@
-/* gEDA - GPL Electronic Design Automation
- * libgeda - gEDA's library
+/* Lepton EDA library
  * Copyright (C) 1998-2000 Ales Hvezda
  * Copyright (C) 2007-2010 Peter Clifton
+ * Copyright (C) 2011-2013 gEDA Contributors
+ * Copyright (C) 2017-2019 Lepton EDA Contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -179,3 +180,22 @@ void geda_list_remove_all( GedaList *lis
   g_signal_emit( list, geda_list_signals[ CHANGED ], 0 );
 }
 
+
+/*! \brief Moves the list data \a item to a new position \a newpos.
+ */
+void geda_list_move_item( GedaList* list, gpointer item, gint newpos )
+{
+  GList* gl = list->glist;
+  GList* node = g_list_find (gl, item);
+
+  if (node != NULL)
+  {
+    gl = g_list_remove_link (gl, node);
+    gl = g_list_insert (gl, item, newpos);
+    g_list_free (node);
+    list->glist = gl;
+
+    g_signal_emit( list, geda_list_signals[ CHANGED ], 0 );
+  }
+}
+




--- liblepton/src/scheme_os.c.orig	2019-10-03 20:45:55 UTC
+++ liblepton/src/scheme_os.c
@@ -153,6 +153,25 @@ SCM_DEFINE (user_config_dir, "%user-conf
   return scm_from_locale_string(eda_get_user_config_dir());
 }
 
+/*! \brief Get user cache directory.
+ * \par Function Description
+ * Returns the directory where per-user cache data should be
+ * stored
+ *
+ * \note Scheme API: Implements the %user-cache-dir procedure is the
+ * (geda core os) module.
+ *
+ * \return a string.
+ */
+SCM_DEFINE (user_cache_dir, "%user-cache-dir", 0, 0, 0, (),
+            "Return the directory for user cache data.")
+{
+  /* eda_get_user_cache_dir() returns a raw environment string, so assume
+   * it's in the current locale's encoding. */
+  return scm_from_locale_string (eda_get_user_cache_dir ());
+}
+
+
 /*!
  * \brief Create the (geda core os) Scheme module.
  * \par Function Description
@@ -166,8 +185,12 @@ init_module_geda_core_os (void *unused)
   #include "scheme_os.x"
 
   /* Add them to the module's public definitions. */
-  scm_c_export (s_platform, s_sys_data_dirs, s_sys_config_dirs,
-                s_user_data_dir, s_user_config_dir,
+  scm_c_export (s_platform,
+                s_sys_config_dirs,
+                s_sys_data_dirs,
+                s_user_cache_dir,
+                s_user_config_dir,
+                s_user_data_dir,
                 NULL);
 }
 

Lines 1-11 Link Here

(-)cad/lepton-eda/files/patch-netlist_scheme_backend_gnet-spice-sdb.scm (-11 lines)
1	--- netlist/scheme/backend/gnet-spice-sdb.scm.orig 2019-10-03 20:45:55 UTC
2	+++ netlist/scheme/backend/gnet-spice-sdb.scm
3	@@ -209,7 +209,7 @@
4	(and (string-ci=? (gnetlist:get-package-attribute package "device")
5	"spice-io")
6	package))
7	- (filter-map spice-io? ls))
8	+ (filter-map spice-io? package-list))
9
10
11	;;; Given a list of spice-IO packages (refdeses), this function




--- schematic/src/x_tabs.c.orig	2019-10-03 20:45:55 UTC
+++ schematic/src/x_tabs.c
@@ -53,7 +53,7 @@
  * key:         use-tabs
  * group:       schematic.gui
  * type:        boolean
- * default val: false
+ * default val: true
  *
  * 2) Whether to show "close" button on tabs:
  * key:         show-close-button
@@ -75,7 +75,7 @@
 
 
 static gboolean
-g_x_tabs_enabled = FALSE;
+g_x_tabs_enabled = TRUE;
 
 static gboolean
 g_x_tabs_show_close_button = TRUE;
@@ -284,6 +284,28 @@ x_tabs_page_on_sel (GtkNotebook* nbook,
                     guint        ndx,
                     gpointer     data);
 
+static void
+x_tabs_page_on_reordered (GtkNotebook* nbook,
+                          GtkWidget*   wtab,
+                          guint        newindex,
+                          gpointer     data);
+
+
+static gboolean
+x_tabs_hdr_on_mouse_click (GtkWidget* hdr, GdkEvent* e, gpointer data);
+static GtkMenu*
+x_tabs_menu_create (TabInfo* nfo);
+static void
+x_tabs_menu_create_item (GschemToplevel* toplevel,
+                         GtkWidget*      menu,
+                         const gchar*    action_name,
+                         const gchar*    action_label,
+                         const gchar*    icon_name);
+static void
+x_tabs_menu_create_item_separ (GtkWidget* menu);
+static void
+x_tabs_menu_item_on_activate (GtkAction* action, gpointer data);
+
 
 
 /* page view: */
@@ -409,7 +431,24 @@ x_tabs_dbg_pages_dump (GschemToplevel* w
   printf( " ^^^^^^^^^^^^^^ pages ^^^^^^^^^^^^^^^^^^\n\n" );
 }
 
-#endif
+static void
+x_tabs_dbg_pages_dump_simple (GschemToplevel* w_current)
+{
+  printf( " >> pages:\n" );
+  g_return_if_fail( w_current != NULL );
+
+  for ( GList* node = w_current->toplevel->pages->glist;
+        node != NULL;
+        node = g_list_next( node ) )
+  {
+    PAGE* p = node->data;
+    printf( "    p: [%s]\n", g_path_get_basename( s_page_get_filename(p) ) );
+  }
+
+  printf( "\n" );
+}
+
+#endif /* DEBUG */
 
 
 
@@ -661,6 +700,11 @@ x_tabs_nbook_create (GschemToplevel* w_c
   g_signal_connect (nbook, "switch-page",
                     G_CALLBACK (&x_tabs_page_on_sel), w_current);
 
+  g_signal_connect (nbook,
+                    "page-reordered",
+                    G_CALLBACK (&x_tabs_page_on_reordered),
+                    w_current);
+
 } /* x_tabs_nbook_create() */
 
 
@@ -913,7 +957,18 @@ x_tabs_hdr_set (GtkNotebook* nbook, TabI
   g_return_if_fail (nfo != NULL);
 
   GtkWidget* hdr = x_tabs_hdr_create (nfo);
-  gtk_notebook_set_tab_label (nbook, nfo->wtab_, hdr);
+
+  GtkWidget* ebox = gtk_event_box_new();
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
+  gtk_container_add (GTK_CONTAINER (ebox), hdr);
+  gtk_widget_show_all (ebox);
+
+  g_signal_connect (ebox,
+                    "button-press-event",
+                    G_CALLBACK (&x_tabs_hdr_on_mouse_click),
+                    nfo);
+
+  gtk_notebook_set_tab_label (nbook, nfo->wtab_, ebox);
 }
 
 
@@ -1160,6 +1215,8 @@ x_tabs_page_new (GschemToplevel* w_curre
   x_tabs_tl_pview_cur_set (w_current, pview);
   gint ndx = x_tabs_nbook_page_add (w_current, page, pview, wtab);
 
+  gtk_notebook_set_tab_reorderable (w_current->xtabs_nbook, wtab, TRUE);
+
   return x_tabs_info_add (w_current, ndx, page, pview, wtab);
 
 } /* x_tabs_page_new() */
@@ -1485,3 +1542,158 @@ x_tabs_page_on_sel (GtkNotebook* nbook,
 
 } /* x_tabs_page_on_sel() */
 
+
+
+/*! \brief GtkNotebook "page-reordered" signal handler.
+ */
+static void
+x_tabs_page_on_reordered (GtkNotebook* nbook,
+                          GtkWidget*   wtab,
+                          guint        newindex,
+                          gpointer     data)
+{
+  GschemToplevel* w_current = (GschemToplevel*) data;
+  g_return_if_fail (w_current != NULL);
+  g_return_if_fail (w_current->toplevel != NULL);
+  g_return_if_fail (w_current->toplevel->pages != NULL);
+
+  TabInfo* nfo = x_tabs_info_find_by_wtab (w_current->xtabs_info_list, wtab);
+  g_return_if_fail (nfo != NULL);
+
+  GedaPageList* pages = w_current->toplevel->pages;
+  geda_list_move_item (pages, nfo->page_, newindex);
+
+  gtk_widget_grab_focus (GTK_WIDGET (nfo->pview_));
+  page_select_widget_update (w_current);
+
+#ifdef DEBUG
+  x_tabs_dbg_pages_dump_simple( w_current );
+#endif
+
+} /* x_tabs_page_on_reordered() */
+
+
+
+/*! \brief Create popup menu for tab's header.
+ */
+static GtkMenu*
+x_tabs_menu_create (TabInfo* nfo)
+{
+  g_return_val_if_fail (nfo != NULL, NULL);
+
+  GschemToplevel* tl = nfo->tl_;
+  g_return_val_if_fail (tl != NULL, NULL);
+
+  GtkWidget* menu = gtk_menu_new();
+  x_tabs_menu_create_item (tl, menu, "file-new", _("_New"), GTK_STOCK_NEW);
+  x_tabs_menu_create_item (tl, menu, "file-open", _("_Open"), GTK_STOCK_OPEN);
+  x_tabs_menu_create_item_separ (menu);
+  x_tabs_menu_create_item (tl, menu, "file-save", _("_Save"), GTK_STOCK_SAVE);
+  x_tabs_menu_create_item (tl, menu, "file-save-as", _("Save _As..."), GTK_STOCK_SAVE_AS);
+  x_tabs_menu_create_item_separ (menu);
+  x_tabs_menu_create_item (tl, menu, "page-manager", _("Page _Manager..."), NULL);
+  x_tabs_menu_create_item_separ (menu);
+  x_tabs_menu_create_item (tl, menu, "page-close", _("_Close"), GTK_STOCK_CLOSE);
+
+  gtk_widget_show_all (menu);
+  return GTK_MENU (menu);
+
+} /* x_tabs_menu_create() */
+
+
+
+/*! \brief Tab's header widget "button-press-event" signal handler.
+ *  \todo  Consider switching to clicked tab
+ */
+static gboolean
+x_tabs_hdr_on_mouse_click (GtkWidget* hdr, GdkEvent* e, gpointer data)
+{
+  g_return_val_if_fail (data != NULL, FALSE);
+  GdkEventButton* ebtn = (GdkEventButton*) e;
+
+  TabInfo* nfo    = (TabInfo*) data;
+  TabInfo* nfocur = x_tabs_info_cur (nfo->tl_);
+
+  /* show menu for current tab only:
+  */
+  if (nfo != nfocur)
+    return FALSE;
+
+#ifdef DEBUG
+  printf( "p: [%s]\n",   g_path_get_basename( s_page_get_filename(nfo->page_) ) );
+  printf( "C: [%s]\n\n", g_path_get_basename( s_page_get_filename(nfocur->page_) ) );
+#endif
+
+  if (ebtn->type == GDK_BUTTON_PRESS && ebtn->button == 3)
+  {
+    GtkMenu* menu = x_tabs_menu_create (nfo);
+
+    int btn = 0;
+    int etime = 0;
+    if (ebtn != NULL)
+    {
+      btn = ebtn->button;
+      etime = gtk_get_current_event_time();
+    }
+
+    gtk_menu_attach_to_widget (menu, hdr, NULL);
+    gtk_menu_popup (menu, NULL, NULL, NULL, NULL, btn, etime);
+
+    return TRUE;
+  }
+
+  return FALSE;
+
+} /* x_tabs_page_on_mouse_click() */
+
+
+
+/*! \brief "activate" signal handler for context menu item action.
+ */
+static void
+x_tabs_menu_item_on_activate (GtkAction* action, gpointer data)
+{
+  GschemToplevel* toplevel    = (GschemToplevel*) data;
+  const gchar*    action_name = gtk_action_get_name (action);
+
+  g_action_eval_by_name (toplevel, action_name);
+}
+
+
+
+/*! \brief Create and add popup menu item separator.
+ */
+static void
+x_tabs_menu_create_item_separ (GtkWidget* menu)
+{
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+                         gtk_separator_menu_item_new());
+}
+
+
+
+/*! \brief Create and add popup menu item.
+ */
+static void
+x_tabs_menu_create_item (GschemToplevel* toplevel,
+                         GtkWidget*      menu,
+                         const gchar*    action_name,
+                         const gchar*    action_label,
+                         const gchar*    icon_name)
+{
+  GschemAction* action = gschem_action_new (action_name,  /* name */
+                                            action_label, /* label */
+                                            NULL,         /* tooltip */
+                                            icon_name,    /* stock_id */
+                                            NULL);        /* multikey_accel */
+
+  GtkWidget* item = gtk_action_create_menu_item (GTK_ACTION (action));
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  g_signal_connect (action,
+                    "activate",
+                    G_CALLBACK (&x_tabs_menu_item_on_activate),
+                    toplevel);
+
+} /* x_tabs_menu_create_item() */
+




--- utils/scripts/lepton-upcfg.in.orig	2020-03-25 12:47:33 UTC
+++ utils/scripts/lepton-upcfg.in
@@ -219,7 +219,13 @@ Lepton EDA homepage: <~a>
   )
 
 
-  ( upcfg-log "ii: upgrading config in [~a]...~%" (config-file-path cfg-id) )
+  ( upcfg-log
+    "ii: upgrading config in [~a]...~%"
+    ( if cfg-id
+      ( config-file-path cfg-id ) ; if
+      ( list-ref files 0 )        ; else
+    )
+  )
 
   ( if ( null? files )
     ( or (config-upgrade cfg-id #:copy copy #:overwrite overwrite) (failure) ) ; if

Lines 1-11 Link Here

(-)cad/lepton-eda/files/patch-version.h (-4 / +4 lines)
1	--- version.h.orig 2019-10-04 15:45:44 UTC	1	--- version.h.orig 2020-03-25 05:39:40 UTC
2	+++ version.h	2	+++ version.h
3	@@ -0,0 +1,8 @@	3	@@ -0,0 +1,8 @@
4	+/* Date part of package version string. */	4	+/* Date part of package version string. */
5	+#define PACKAGE_DATE_VERSION "20191003"	5	+#define PACKAGE_DATE_VERSION "20200319"
6	+	6	+
7	+/* Dotted part of package version string. */	7	+/* Dotted part of package version string. */
8	+#define PACKAGE_DOTTED_VERSION "1.9.9"	8	+#define PACKAGE_DOTTED_VERSION "1.9.10"
9	+	9	+
10	+/* Current git commit. */	10	+/* Current git commit. */
11	+#define PACKAGE_GIT_COMMIT "3139e7782564ff4bf76963984a735fbe638e43a0"	11	+#define PACKAGE_GIT_COMMIT "c69155b34b82d2b288f4787f92fe930112e73c72"

Lines 1-6 Link Here

(-)cad/lepton-eda/pkg-descr (-4 / +6 lines)
1	The Lepton EDA suite provides schematic capture, netlisting, bill	1	Lepton EDA is a suite of free software tools for designing
2	of materials generation, and many other features. It was forked	2	electronics. It provides schematic capture, netlisting into
3	from the gEDA/gaf suite in late 2016. It's in active development	3	over 30 netlist formats, and many other features.
4	and well supported.	4	It was forked from the gEDA/gaf suite in late 2016 by most
		5	of its active developers at that time.
		6	It's in active development and well supported.
5		7
6	WWW: https://github.com/lepton-eda/lepton-eda	8	WWW: https://github.com/lepton-eda/lepton-eda




bin/lepton-archive
bin/lepton-attrib
bin/lepton-cli
bin/lepton-embed
bin/lepton-netlist
bin/lepton-pcb_backannotate
bin/lepton-refdes_renum

bin/lepton-sch2pcb
bin/lepton-schdiff
bin/lepton-schematic
bin/lepton-schlas
bin/lepton-symcheck
bin/lepton-symfix
bin/lepton-tragesym

include/liblepton/geda_circle_object.h
include/liblepton/geda_color.h
include/liblepton/geda_color_map.h
include/liblepton/geda_component.h
include/liblepton/geda_component_object.h
include/liblepton/geda_coord.h
include/liblepton/geda_fill_type.h
include/liblepton/geda_forward.h

include/libleptonrenderer/edarenderer.h
include/libleptonrenderer/libleptonrenderer.h
lib/liblepton.so
lib/liblepton.so.5
lib/liblepton.so.5.0.0
lib/libleptonrenderer.so
lib/libleptonrenderer.so.2
lib/libleptonrenderer.so.2.0.0
libdata/pkgconfig/liblepton.pc
libdata/pkgconfig/libleptonrenderer.pc
man/man1/lepton-archive.1.gz
man/man1/lepton-attrib.1.gz
man/man1/lepton-cli.1.gz
man/man1/lepton-embed.1.gz
man/man1/lepton-netlist.1.gz
man/man1/lepton-pcb_backannotate.1.gz
man/man1/lepton-refdes_renum.1.gz

man/man1/lepton-sch2pcb.1.gz
man/man1/lepton-schdiff.1.gz
man/man1/lepton-schematic.1.gz
man/man1/lepton-schlas.1.gz
man/man1/lepton-symcheck.1.gz
man/man1/lepton-symfix.1.gz
man/man1/lepton-tragesym.1.gz
share/applications/lepton-attrib.desktop
share/applications/lepton-schematic.desktop
%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/gedadocs.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton-scheme.css
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Actions.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Arcs.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Attributes.html

%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Core-object-functions.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Core-page-functions.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Core-source-library-functions.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Files-and-pages.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Function-Index.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/General-object-functions.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Hooks.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/index.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Introduction.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Key-mapping.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton_002dnetlist-API-Reference.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton_002dschematic-API-Reference.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Lines.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Logging-functions.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Miscellanous-lepton_002dschematic-functions.html

%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-bounds.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-color.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-fill-and-stroke.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Objects.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-sub_002dtypes.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-transformations.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Objects.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Pages.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Paths.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Pictures.html

%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Text.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Variable-Index.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Windows-and-views.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/index.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton-scheme.css
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton_002dnetlist-API-Reference.html
%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton_002dschematic-API-Reference.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-archive.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-attrib.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-cli.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-embed.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-netlist.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-pcb_backannotate.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-refdes_renum.html

%%PORTDOCS%%%%DOCSDIR%%/man/lepton-sch2pcb.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-schdiff.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-schematic.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-schlas.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-symcheck.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-symfix.html
%%PORTDOCS%%%%DOCSDIR%%/man/lepton-tragesym.html

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q2.cir
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q2.sch
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Simulation.batch.cmd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Simulation.cmd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/gafrc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/BJTM1_Q1.mod

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM3_Q2.mod
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/BJT_Model.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/Q_Model.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/capacitor-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/diode-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/gnd-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/inductor-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/resistor-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/spice-include-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/spice-subcircuit-IO-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/spice-subcircuit-LL-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/title-B.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/vac-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/vdc-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/Simulation.batch.cmd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/Simulation.cmd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/TwoStageAmp.sch
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/gafrc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/models/2N3904.mod
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/spice.netlist
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/capacitor-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/gnd-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/resistor-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/spice-directive-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/spice-include-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/spice-model-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/title-B.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/transistor.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/vcc-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/vdc-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/vsin-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/attribs
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/copyleft.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/crdist.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/cy7c64603-52nc.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.sch
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.sch
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-pcb.net
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.sch
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.sch
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.bom
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.sch
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gafrc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/geda.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/ps/gTAG-consio.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/ps/gTAG-jtagio.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/ps/gTAG-psu.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/ps/gTAG-ucont.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/ps/gTAG.ps
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/24Cxx-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/3.3V-plus-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/5V-plus-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/7414-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/capacitor-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/capacitor-2.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/connector4-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/connector8-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/copyleft.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/crystal-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/cy7c64603-52nc.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/gTAG-consio.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/gTAG-jtagio.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/gTAG-psu.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/gTAG-ucont.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/gnd-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/header20-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/in-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/jumper-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/max882.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/out-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/resistor-2.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/sn75240pw.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sym/title-A2.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/gafrc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.net
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.pcb

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.sch.bom
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/2N4401.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/2N4403.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/capacitor-2.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/diode-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/in-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/inductor-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/out-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/resistor-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/resistor-variable-1.sym
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/title-A4.sym
share/icons/hicolor/16x16/mimetypes/application-x-lepton-sch2pcb-project.png
share/icons/hicolor/16x16/mimetypes/application-x-lepton-schematic.png
share/icons/hicolor/16x16/mimetypes/application-x-lepton-symbol.png

%%DATADIR%%/bitmap/gschem-top2bottom.png
%%DATADIR%%/bitmap/gschem-undo.xpm
%%DATADIR%%/bitmap/gschem-warning.png
%%DATADIR%%/gafrc.d/config-netlist.scm
%%DATADIR%%/gafrc.d/geda-clib.scm
%%DATADIR%%/geda-system.conf
%%DATADIR%%/gschem-colormap-bw
%%DATADIR%%/gschem-colormap-darkbg
%%DATADIR%%/gschem-colormap-lightbg
%%DATADIR%%/gschem-gtkrc
%%DATADIR%%/icons/hicolor/16x16/actions/attribute-attach.png
%%DATADIR%%/icons/hicolor/16x16/actions/attribute-detach.png
%%DATADIR%%/icons/hicolor/16x16/actions/attribute-show-both.png

%%DATADIR%%/icons/hicolor/22x22/actions/insert-symbol.png
%%DATADIR%%/icons/hicolor/22x22/actions/insert-text.png
%%DATADIR%%/icons/hicolor/22x22/actions/select.png
%%DATADIR%%/lepton-gtkrc
%%DATADIR%%/lepton-system.conf
%%DATADIR%%/print-colormap-darkbg
%%DATADIR%%/print-colormap-lightbg

%%DATADIR%%/scheme/auto-place-netname.scm
%%DATADIR%%/scheme/auto-refdes.scm
%%DATADIR%%/scheme/auto-uref.scm
%%DATADIR%%/scheme/autoload/config-netlist.scm
%%DATADIR%%/scheme/autoload/config-symbol-libraries.scm
%%DATADIR%%/scheme/backend/gnet-PCB.scm
%%DATADIR%%/scheme/backend/gnet-allegro.scm
%%DATADIR%%/scheme/backend/gnet-bae.scm

%%DATADIR%%/scheme/conf/schematic/deprecated.scm
%%DATADIR%%/scheme/conf/schematic/keys.scm
%%DATADIR%%/scheme/conf/schematic/menu.scm
%%DATADIR%%/scheme/conf/schematic/options.scm
%%DATADIR%%/scheme/conf/schematic/stroke.scm
%%DATADIR%%/scheme/default-attrib-positions.scm
%%DATADIR%%/scheme/geda-deprecated-config.scm

%%DATADIR%%/scheme/geda.scm
%%DATADIR%%/scheme/geda/attrib.scm
%%DATADIR%%/scheme/geda/config.scm
%%DATADIR%%/scheme/geda/core/gettext.scm
%%DATADIR%%/scheme/geda/deprecated.scm
%%DATADIR%%/scheme/geda/library.scm
%%DATADIR%%/scheme/geda/log-rotate.scm
%%DATADIR%%/scheme/geda/log.scm
%%DATADIR%%/scheme/geda/object.scm
%%DATADIR%%/scheme/geda/os.scm
%%DATADIR%%/scheme/geda/page.scm
%%DATADIR%%/scheme/geda/repl.scm
%%DATADIR%%/scheme/gschem/action.scm
%%DATADIR%%/scheme/gschem/attrib.scm
%%DATADIR%%/scheme/gschem/builtins.scm
%%DATADIR%%/scheme/gschem/core/gettext.scm
%%DATADIR%%/scheme/gschem/deprecated.scm
%%DATADIR%%/scheme/gschem/gschemdoc.scm
%%DATADIR%%/scheme/gschem/hook.scm
%%DATADIR%%/scheme/gschem/keymap.scm
%%DATADIR%%/scheme/gschem/repl.scm
%%DATADIR%%/scheme/gschem/selection.scm
%%DATADIR%%/scheme/gschem/symbol/check.scm
%%DATADIR%%/scheme/gschem/util.scm
%%DATADIR%%/scheme/gschem/window.scm
%%DATADIR%%/scheme/lepton/attrib.scm
%%DATADIR%%/scheme/lepton/config.scm
%%DATADIR%%/scheme/lepton/core/gettext.scm
%%DATADIR%%/scheme/lepton/file-system.scm
%%DATADIR%%/scheme/lepton/legacy-config.scm
%%DATADIR%%/scheme/lepton/legacy-config/keylist.scm
%%DATADIR%%/scheme/lepton/library.scm
%%DATADIR%%/scheme/lepton/library/component.scm
%%DATADIR%%/scheme/lepton/log-rotate.scm
%%DATADIR%%/scheme/lepton/log.scm
%%DATADIR%%/scheme/lepton/object.scm
%%DATADIR%%/scheme/lepton/os.scm
%%DATADIR%%/scheme/lepton/page.scm
%%DATADIR%%/scheme/lepton/rc.scm
%%DATADIR%%/scheme/lepton/repl.scm
%%DATADIR%%/scheme/lepton/version.scm
%%DATADIR%%/scheme/list-keys.scm
%%DATADIR%%/scheme/netlist.scm
%%DATADIR%%/scheme/netlist/attrib/compare.scm
%%DATADIR%%/scheme/netlist/attrib/refdes.scm
%%DATADIR%%/scheme/netlist/backend-getopt.scm
%%DATADIR%%/scheme/netlist/config.scm
%%DATADIR%%/scheme/netlist/core/gettext.scm
%%DATADIR%%/scheme/netlist/deprecated.scm
%%DATADIR%%/scheme/netlist/duplicate.scm
%%DATADIR%%/scheme/netlist/error.scm
%%DATADIR%%/scheme/netlist/hierarchy.scm
%%DATADIR%%/scheme/netlist/mode.scm
%%DATADIR%%/scheme/netlist/net.scm
%%DATADIR%%/scheme/netlist/option.scm
%%DATADIR%%/scheme/netlist/package-pin.scm
%%DATADIR%%/scheme/netlist/package.scm
%%DATADIR%%/scheme/netlist/page.scm
%%DATADIR%%/scheme/netlist/partlist.scm
%%DATADIR%%/scheme/netlist/partlist/common.scm
%%DATADIR%%/scheme/netlist/pin-net.scm
%%DATADIR%%/scheme/netlist/port.scm
%%DATADIR%%/scheme/netlist/rename.scm
%%DATADIR%%/scheme/netlist/repl.scm
%%DATADIR%%/scheme/netlist/schematic-component.scm
%%DATADIR%%/scheme/netlist/schematic-connection.scm
%%DATADIR%%/scheme/netlist/schematic-port.scm
%%DATADIR%%/scheme/netlist/schematic.scm
%%DATADIR%%/scheme/netlist/schematic/toplevel.scm
%%DATADIR%%/scheme/netlist/subschematic-connection.scm
%%DATADIR%%/scheme/netlist/subschematic.scm
%%DATADIR%%/scheme/netlist/verbose.scm
%%DATADIR%%/scheme/pcb.scm
%%DATADIR%%/scheme/schematic/action.scm
%%DATADIR%%/scheme/schematic/attrib.scm
%%DATADIR%%/scheme/schematic/builtins.scm
%%DATADIR%%/scheme/schematic/core/gettext.scm
%%DATADIR%%/scheme/schematic/gschemdoc.scm
%%DATADIR%%/scheme/schematic/gui/keymap.scm
%%DATADIR%%/scheme/schematic/gui/stroke.scm
%%DATADIR%%/scheme/schematic/hook.scm
%%DATADIR%%/scheme/schematic/keymap.scm
%%DATADIR%%/scheme/schematic/netlist.scm
%%DATADIR%%/scheme/schematic/precompile.scm
%%DATADIR%%/scheme/schematic/repl.scm
%%DATADIR%%/scheme/schematic/selection.scm
%%DATADIR%%/scheme/schematic/symbol/check.scm
%%DATADIR%%/scheme/schematic/undo.scm
%%DATADIR%%/scheme/schematic/util.scm
%%DATADIR%%/scheme/schematic/window.scm
%%DATADIR%%/scheme/symbol/blame.scm
%%DATADIR%%/scheme/symbol/check.scm
%%DATADIR%%/scheme/symbol/check/alignment.scm

Return to bug 245068

Lines 1-8 Link Here

(-)cad/lepton-eda/Makefile (-10 / +14 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= lepton-eda	3	PORTNAME= lepton-eda
4	PORTVERSION= 1.9.9	4	PORTVERSION= 1.9.10
5	DISTVERSIONSUFFIX= -20191003	5	DISTVERSIONSUFFIX= -20200319
6	CATEGORIES= cad	6	CATEGORIES= cad
7		7
8	MAINTAINER= graahnul.grom@gmail.com	8	MAINTAINER= graahnul.grom@gmail.com
Lines 19-37 Link Here
19		19
20	USES= autoreconf desktop-file-utils gettext-tools gnome \	20	USES= autoreconf desktop-file-utils gettext-tools gnome \
21	groff:build libtool localbase makeinfo pathfix perl5 \	21	groff:build libtool localbase makeinfo pathfix perl5 \
22	pkgconfig python:2.7,run shared-mime-info shebangfix	22	pkgconfig shared-mime-info shebangfix
23	USE_GITHUB= yes	23	USE_GITHUB= yes
24	USE_GNOME= cairo gtk20	24	USE_GNOME= cairo gtk20
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26		26
27	SHEBANG_FILES= utils/scripts/lepton-tragesym \	27	SHEBANG_FILES= utils/scripts/lepton-pcb_backannotate \
28	utils/scripts/lepton-archive.py \
29	utils/scripts/gschupdate \
30	utils/scripts/gsymupdate \
31	utils/scripts/lepton-pcb_backannotate \
32	utils/scripts/lepton-refdes_renum \	28	utils/scripts/lepton-refdes_renum \
33	utils/scripts/lepton-symfix \	29	utils/scripts/lepton-symfix
34	examples/lightning_detector/bom
35		30
36	PORTEXAMPLES= examples/*	31	PORTEXAMPLES= examples/*
37		32
Lines 48-51 Link Here
48	NLS_CONFIGURE_ENABLE= nls	43	NLS_CONFIGURE_ENABLE= nls
49	NLS_USES= gettext-runtime	44	NLS_USES= gettext-runtime
50		45
		46	post-patch:
		47	${REINPLACE_CMD} -e \
		48	's,\$$(docdir)/examples,\$$(datadir)/examples/lepton-eda,' \
		49	${WRKSRC}/examples/Makefile.am \
		50	${WRKSRC}/examples/RF_Amp/Makefile.am \
		51	${WRKSRC}/examples/TwoStageAmp/Makefile.am \
		52	${WRKSRC}/examples/gTAG/Makefile.am \
		53	${WRKSRC}/examples/lightning_detector/Makefile.am
		54
51	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)cad/lepton-eda/files/patch-build-tools_icon-theme-installer (-20 lines)
1	--- build-tools/icon-theme-installer.orig 2019-10-03 20:45:55 UTC
2	+++ build-tools/icon-theme-installer
3	@@ -103,13 +103,13 @@ if test -z "$INSTALL_BASE_DIR"; then
4	exit 1
5	fi
6
7	-if test ! -x `echo "$MKINSTALLDIRS_EXEC" \| cut -f1 -d' '`; then
8	- echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
9	+if test -z "$MKINSTALLDIRS_EXEC"; then
10	+ echo "\$MKINSTALLDIRS_EXEC is not set. Pass it with the -m command line option"
11	exit 1
12	fi
13
14	-if test ! -x `echo "$INSTALL_DATA_EXEC" \| cut -f1 -d' '`; then
15	- echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
16	+if test -z "$INSTALL_DATA_EXEC"; then
17	+ echo "\$INSTALL_DATA_EXEC' is not set. Pass it with the -x command line option"
18	exit 1
19	fi
20

Lines 1-14 Link Here

(-)cad/lepton-eda/files/patch-docs_scheme-api_Makefile.am (-14 lines)
1	--- docs/scheme-api/Makefile.am.orig 2019-10-09 16:39:51 UTC
2	+++ docs/scheme-api/Makefile.am
3	@@ -4,10 +4,8 @@ AM_MAKEINFOHTMLFLAGS = --css-ref=lepton-
4
5	EXTRA_DIST = lepton-scheme.css
6
7	-html-local:
8	+all: all-am html
9	$(MKDIR_P) $(builddir)/lepton-scheme.html/
10	cp -fv $(srcdir)/lepton-scheme.css $(builddir)/lepton-scheme.html/
11
12	-all-local: html
13	-
14	install-data-local: install-html

Lines 1-24 Link Here

(-)cad/lepton-eda/files/patch-examples_Makefile.am (-24 lines)
1	--- examples/Makefile.am.orig 2019-02-23 08:55:55 UTC
2	+++ examples/Makefile.am
3	@@ -1,9 +1,9 @@
4
5	SUBDIRS = gTAG lightning_detector RF_Amp TwoStageAmp
6
7	-exampledir = $(docdir)/examples/
8	+exampledir = $(datadir)/examples/lepton-eda/
9
10	-example_DATA = README
11	+example_DATA = README
12
13	EXTRA_DIST = ChangeLog ChangeLog-1.0 $(example_DATA)
14
15	@@ -16,7 +16,7 @@ ChangeLog: $(top_builddir)/stamp-git
16	) > $@
17	endif HAVE_GIT_REPO
18
19	-MOSTLYCLEANFILES = .log core FILE ~
20	-CLEANFILES = .log core FILE ~
21	+MOSTLYCLEANFILES = .log core FILE ~
22	+CLEANFILES = .log core FILE ~
23	DISTCLEANFILES = .log core FILE ~
24	MAINTAINERCLEANFILES = .log core FILE ~ Makefile.in ChangeLog

Lines 1-12 Link Here

(-)cad/lepton-eda/files/patch-examples_RF__Amp_model_Makefile.am (-12 lines)
1	--- examples/RF_Amp/model/Makefile.am.orig 2019-02-23 08:55:55 UTC
2	+++ examples/RF_Amp/model/Makefile.am
3	@@ -1,7 +1,7 @@
4	-exampledir = $(docdir)/examples/RF_Amp/model/
5	+exampledir = $(datadir)/examples/lepton-eda/RF_Amp/model/
6
7	example_DATA = BJTM1_Q1.mod BJTM1_Q2.mod DiodeM1_Q1.mod DiodeM1_Q2.mod \
8	- DiodeM2_Q1.mod DiodeM2_Q2.mod DiodeM3_Q1.mod DiodeM3_Q2.mod
9	+ DiodeM2_Q1.mod DiodeM2_Q2.mod DiodeM3_Q1.mod DiodeM3_Q2.mod
10
11	EXTRA_DIST = $(example_DATA)
12

Lines 1-16 Link Here

(-)cad/lepton-eda/files/patch-examples_lightning__detector_Makefile.am (-16 lines)
1	--- examples/lightning_detector/Makefile.am.orig 2019-02-23 08:55:55 UTC
2	+++ examples/lightning_detector/Makefile.am
3	@@ -1,11 +1,11 @@
4	-exampledir = $(docdir)/examples/lightning_detector/
5	+exampledir = $(datadir)/examples/lepton-eda/lightning_detector/
6
7	nobase_example_DATA = \
8	bom bom.readme lightning.net lightning.pcb lightning.sch \
9	lightning.sch.bom gafrc \
10	sym/2N4401.sym sym/2N4403.sym
11
12	-EXTRA_DIST = $(nobase_example_DATA)
13	+EXTRA_DIST = $(nobase_example_DATA)
14
15	MOSTLYCLEANFILES = gschem.log *~
16	CLEANFILES = gschem.log *~

Lines 1-23 Link Here

(-)cad/lepton-eda/files/patch-liblepton_include_liblepton_geda__list.h (-23 lines)
1	--- liblepton/include/liblepton/geda_list.h.orig 2019-10-03 20:45:55 UTC
2	+++ liblepton/include/liblepton/geda_list.h
3	@@ -1,7 +1,8 @@
4	-/* gEDA - GPL Electronic Design Automation
5	- * libgeda - gEDA's library
6	+/* Lepton EDA library
7	* Copyright (C) 1998-2010 Ales Hvezda
8	* Copyright (C) 2007-2010 Peter Clifton
9	+ * Copyright (C) 2011-2015 gEDA Contributors
10	+ * Copyright (C) 2017-2019 Lepton EDA Contributors
11	*
12	* This library is free software; you can redistribute it and/or
13	* modify it under the terms of the GNU Library General Public
14	@@ -56,6 +57,9 @@ void geda_list_add_glist( GedaList *list
15	void geda_list_remove( GedaList *list, gpointer item );
16	/void geda_list_remove_glist( GedaList list, GList items ); / /* Undemanded as yet */
17	void geda_list_remove_all( GedaList *list );
18	+void geda_list_move_item( GedaList* list, gpointer item, gint newpos );
19	+
20	+
21
22	/const GList geda_list_get_glist( GedaList list ); /
23	#define geda_list_get_glist(list) (list->glist)

Lines 1-36 Link Here

(-)cad/lepton-eda/files/patch-liblepton_src_geda__list.c (-36 lines)
1	--- liblepton/src/geda_list.c.orig 2019-10-03 20:45:55 UTC
2	+++ liblepton/src/geda_list.c
3	@@ -1,7 +1,8 @@
4	-/* gEDA - GPL Electronic Design Automation
5	- * libgeda - gEDA's library
6	+/* Lepton EDA library
7	* Copyright (C) 1998-2000 Ales Hvezda
8	* Copyright (C) 2007-2010 Peter Clifton
9	+ * Copyright (C) 2011-2013 gEDA Contributors
10	+ * Copyright (C) 2017-2019 Lepton EDA Contributors
11	*
12	* This program is free software; you can redistribute it and/or modify
13	* it under the terms of the GNU General Public License as published by
14	@@ -179,3 +180,22 @@ void geda_list_remove_all( GedaList *lis
15	g_signal_emit( list, geda_list_signals[ CHANGED ], 0 );
16	}
17
18	+
19	+/*! \brief Moves the list data \a item to a new position \a newpos.
20	+ */
21	+void geda_list_move_item( GedaList* list, gpointer item, gint newpos )
22	+{
23	+ GList* gl = list->glist;
24	+ GList* node = g_list_find (gl, item);
25	+
26	+ if (node != NULL)
27	+ {
28	+ gl = g_list_remove_link (gl, node);
29	+ gl = g_list_insert (gl, item, newpos);
30	+ g_list_free (node);
31	+ list->glist = gl;
32	+
33	+ g_signal_emit( list, geda_list_signals[ CHANGED ], 0 );
34	+ }
35	+}
36	+

Lines 1-43 Link Here

(-)cad/lepton-eda/files/patch-liblepton_src_scheme__os.c (-43 lines)
1	--- liblepton/src/scheme_os.c.orig 2019-10-03 20:45:55 UTC
2	+++ liblepton/src/scheme_os.c
3	@@ -153,6 +153,25 @@ SCM_DEFINE (user_config_dir, "%user-conf
4	return scm_from_locale_string(eda_get_user_config_dir());
5	}
6
7	+/*! \brief Get user cache directory.
8	+ * \par Function Description
9	+ * Returns the directory where per-user cache data should be
10	+ * stored
11	+ *
12	+ * \note Scheme API: Implements the %user-cache-dir procedure is the
13	+ * (geda core os) module.
14	+ *
15	+ * \return a string.
16	+ */
17	+SCM_DEFINE (user_cache_dir, "%user-cache-dir", 0, 0, 0, (),
18	+ "Return the directory for user cache data.")
19	+{
20	+ /* eda_get_user_cache_dir() returns a raw environment string, so assume
21	+ * it's in the current locale's encoding. */
22	+ return scm_from_locale_string (eda_get_user_cache_dir ());
23	+}
24	+
25	+
26	/*!
27	* \brief Create the (geda core os) Scheme module.
28	* \par Function Description
29	@@ -166,8 +185,12 @@ init_module_geda_core_os (void *unused)
30	#include "scheme_os.x"
31
32	/* Add them to the module's public definitions. */
33	- scm_c_export (s_platform, s_sys_data_dirs, s_sys_config_dirs,
34	- s_user_data_dir, s_user_config_dir,
35	+ scm_c_export (s_platform,
36	+ s_sys_config_dirs,
37	+ s_sys_data_dirs,
38	+ s_user_cache_dir,
39	+ s_user_config_dir,
40	+ s_user_data_dir,
41	NULL);
42	}
43

Lines 1-275 Link Here

(-)cad/lepton-eda/files/patch-schematic_src_x__tabs.c (-275 lines)
1	--- schematic/src/x_tabs.c.orig 2019-10-03 20:45:55 UTC
2	+++ schematic/src/x_tabs.c
3	@@ -53,7 +53,7 @@
4	* key: use-tabs
5	* group: schematic.gui
6	* type: boolean
7	- * default val: false
8	+ * default val: true
9	*
10	* 2) Whether to show "close" button on tabs:
11	* key: show-close-button
12	@@ -75,7 +75,7 @@
13
14
15	static gboolean
16	-g_x_tabs_enabled = FALSE;
17	+g_x_tabs_enabled = TRUE;
18
19	static gboolean
20	g_x_tabs_show_close_button = TRUE;
21	@@ -284,6 +284,28 @@ x_tabs_page_on_sel (GtkNotebook* nbook,
22	guint ndx,
23	gpointer data);
24
25	+static void
26	+x_tabs_page_on_reordered (GtkNotebook* nbook,
27	+ GtkWidget* wtab,
28	+ guint newindex,
29	+ gpointer data);
30	+
31	+
32	+static gboolean
33	+x_tabs_hdr_on_mouse_click (GtkWidget* hdr, GdkEvent* e, gpointer data);
34	+static GtkMenu*
35	+x_tabs_menu_create (TabInfo* nfo);
36	+static void
37	+x_tabs_menu_create_item (GschemToplevel* toplevel,
38	+ GtkWidget* menu,
39	+ const gchar* action_name,
40	+ const gchar* action_label,
41	+ const gchar* icon_name);
42	+static void
43	+x_tabs_menu_create_item_separ (GtkWidget* menu);
44	+static void
45	+x_tabs_menu_item_on_activate (GtkAction* action, gpointer data);
46	+
47
48
49	/* page view: */
50	@@ -409,7 +431,24 @@ x_tabs_dbg_pages_dump (GschemToplevel* w
51	printf( " ^^^^^^^^^^^^^^ pages ^^^^^^^^^^^^^^^^^^\n\n" );
52	}
53
54	-#endif
55	+static void
56	+x_tabs_dbg_pages_dump_simple (GschemToplevel* w_current)
57	+{
58	+ printf( " >> pages:\n" );
59	+ g_return_if_fail( w_current != NULL );
60	+
61	+ for ( GList* node = w_current->toplevel->pages->glist;
62	+ node != NULL;
63	+ node = g_list_next( node ) )
64	+ {
65	+ PAGE* p = node->data;
66	+ printf( " p: [%s]\n", g_path_get_basename( s_page_get_filename(p) ) );
67	+ }
68	+
69	+ printf( "\n" );
70	+}
71	+
72	+#endif /* DEBUG */
73
74
75
76	@@ -661,6 +700,11 @@ x_tabs_nbook_create (GschemToplevel* w_c
77	g_signal_connect (nbook, "switch-page",
78	G_CALLBACK (&x_tabs_page_on_sel), w_current);
79
80	+ g_signal_connect (nbook,
81	+ "page-reordered",
82	+ G_CALLBACK (&x_tabs_page_on_reordered),
83	+ w_current);
84	+
85	} /* x_tabs_nbook_create() */
86
87
88	@@ -913,7 +957,18 @@ x_tabs_hdr_set (GtkNotebook* nbook, TabI
89	g_return_if_fail (nfo != NULL);
90
91	GtkWidget* hdr = x_tabs_hdr_create (nfo);
92	- gtk_notebook_set_tab_label (nbook, nfo->wtab_, hdr);
93	+
94	+ GtkWidget* ebox = gtk_event_box_new();
95	+ gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
96	+ gtk_container_add (GTK_CONTAINER (ebox), hdr);
97	+ gtk_widget_show_all (ebox);
98	+
99	+ g_signal_connect (ebox,
100	+ "button-press-event",
101	+ G_CALLBACK (&x_tabs_hdr_on_mouse_click),
102	+ nfo);
103	+
104	+ gtk_notebook_set_tab_label (nbook, nfo->wtab_, ebox);
105	}
106
107
108	@@ -1160,6 +1215,8 @@ x_tabs_page_new (GschemToplevel* w_curre
109	x_tabs_tl_pview_cur_set (w_current, pview);
110	gint ndx = x_tabs_nbook_page_add (w_current, page, pview, wtab);
111
112	+ gtk_notebook_set_tab_reorderable (w_current->xtabs_nbook, wtab, TRUE);
113	+
114	return x_tabs_info_add (w_current, ndx, page, pview, wtab);
115
116	} /* x_tabs_page_new() */
117	@@ -1485,3 +1542,158 @@ x_tabs_page_on_sel (GtkNotebook* nbook,
118
119	} /* x_tabs_page_on_sel() */
120
121	+
122	+
123	+/*! \brief GtkNotebook "page-reordered" signal handler.
124	+ */
125	+static void
126	+x_tabs_page_on_reordered (GtkNotebook* nbook,
127	+ GtkWidget* wtab,
128	+ guint newindex,
129	+ gpointer data)
130	+{
131	+ GschemToplevel* w_current = (GschemToplevel*) data;
132	+ g_return_if_fail (w_current != NULL);
133	+ g_return_if_fail (w_current->toplevel != NULL);
134	+ g_return_if_fail (w_current->toplevel->pages != NULL);
135	+
136	+ TabInfo* nfo = x_tabs_info_find_by_wtab (w_current->xtabs_info_list, wtab);
137	+ g_return_if_fail (nfo != NULL);
138	+
139	+ GedaPageList* pages = w_current->toplevel->pages;
140	+ geda_list_move_item (pages, nfo->page_, newindex);
141	+
142	+ gtk_widget_grab_focus (GTK_WIDGET (nfo->pview_));
143	+ page_select_widget_update (w_current);
144	+
145	+#ifdef DEBUG
146	+ x_tabs_dbg_pages_dump_simple( w_current );
147	+#endif
148	+
149	+} /* x_tabs_page_on_reordered() */
150	+
151	+
152	+
153	+/*! \brief Create popup menu for tab's header.
154	+ */
155	+static GtkMenu*
156	+x_tabs_menu_create (TabInfo* nfo)
157	+{
158	+ g_return_val_if_fail (nfo != NULL, NULL);
159	+
160	+ GschemToplevel* tl = nfo->tl_;
161	+ g_return_val_if_fail (tl != NULL, NULL);
162	+
163	+ GtkWidget* menu = gtk_menu_new();
164	+ x_tabs_menu_create_item (tl, menu, "file-new", _("_New"), GTK_STOCK_NEW);
165	+ x_tabs_menu_create_item (tl, menu, "file-open", _("_Open"), GTK_STOCK_OPEN);
166	+ x_tabs_menu_create_item_separ (menu);
167	+ x_tabs_menu_create_item (tl, menu, "file-save", _("_Save"), GTK_STOCK_SAVE);
168	+ x_tabs_menu_create_item (tl, menu, "file-save-as", _("Save _As..."), GTK_STOCK_SAVE_AS);
169	+ x_tabs_menu_create_item_separ (menu);
170	+ x_tabs_menu_create_item (tl, menu, "page-manager", _("Page _Manager..."), NULL);
171	+ x_tabs_menu_create_item_separ (menu);
172	+ x_tabs_menu_create_item (tl, menu, "page-close", _("_Close"), GTK_STOCK_CLOSE);
173	+
174	+ gtk_widget_show_all (menu);
175	+ return GTK_MENU (menu);
176	+
177	+} /* x_tabs_menu_create() */
178	+
179	+
180	+
181	+/*! \brief Tab's header widget "button-press-event" signal handler.
182	+ * \todo Consider switching to clicked tab
183	+ */
184	+static gboolean
185	+x_tabs_hdr_on_mouse_click (GtkWidget* hdr, GdkEvent* e, gpointer data)
186	+{
187	+ g_return_val_if_fail (data != NULL, FALSE);
188	+ GdkEventButton* ebtn = (GdkEventButton*) e;
189	+
190	+ TabInfo* nfo = (TabInfo*) data;
191	+ TabInfo* nfocur = x_tabs_info_cur (nfo->tl_);
192	+
193	+ /* show menu for current tab only:
194	+ */
195	+ if (nfo != nfocur)
196	+ return FALSE;
197	+
198	+#ifdef DEBUG
199	+ printf( "p: [%s]\n", g_path_get_basename( s_page_get_filename(nfo->page_) ) );
200	+ printf( "C: [%s]\n\n", g_path_get_basename( s_page_get_filename(nfocur->page_) ) );
201	+#endif
202	+
203	+ if (ebtn->type == GDK_BUTTON_PRESS && ebtn->button == 3)
204	+ {
205	+ GtkMenu* menu = x_tabs_menu_create (nfo);
206	+
207	+ int btn = 0;
208	+ int etime = 0;
209	+ if (ebtn != NULL)
210	+ {
211	+ btn = ebtn->button;
212	+ etime = gtk_get_current_event_time();
213	+ }
214	+
215	+ gtk_menu_attach_to_widget (menu, hdr, NULL);
216	+ gtk_menu_popup (menu, NULL, NULL, NULL, NULL, btn, etime);
217	+
218	+ return TRUE;
219	+ }
220	+
221	+ return FALSE;
222	+
223	+} /* x_tabs_page_on_mouse_click() */
224	+
225	+
226	+
227	+/*! \brief "activate" signal handler for context menu item action.
228	+ */
229	+static void
230	+x_tabs_menu_item_on_activate (GtkAction* action, gpointer data)
231	+{
232	+ GschemToplevel* toplevel = (GschemToplevel*) data;
233	+ const gchar* action_name = gtk_action_get_name (action);
234	+
235	+ g_action_eval_by_name (toplevel, action_name);
236	+}
237	+
238	+
239	+
240	+/*! \brief Create and add popup menu item separator.
241	+ */
242	+static void
243	+x_tabs_menu_create_item_separ (GtkWidget* menu)
244	+{
245	+ gtk_menu_shell_append (GTK_MENU_SHELL (menu),
246	+ gtk_separator_menu_item_new());
247	+}
248	+
249	+
250	+
251	+/*! \brief Create and add popup menu item.
252	+ */
253	+static void
254	+x_tabs_menu_create_item (GschemToplevel* toplevel,
255	+ GtkWidget* menu,
256	+ const gchar* action_name,
257	+ const gchar* action_label,
258	+ const gchar* icon_name)
259	+{
260	+ GschemAction* action = gschem_action_new (action_name, /* name */
261	+ action_label, /* label */
262	+ NULL, /* tooltip */
263	+ icon_name, /* stock_id */
264	+ NULL); /* multikey_accel */
265	+
266	+ GtkWidget* item = gtk_action_create_menu_item (GTK_ACTION (action));
267	+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
268	+
269	+ g_signal_connect (action,
270	+ "activate",
271	+ G_CALLBACK (&x_tabs_menu_item_on_activate),
272	+ toplevel);
273	+
274	+} /* x_tabs_menu_create_item() */
275	+

Line 0 Link Here

(-)cad/lepton-eda/files/patch-utils_scripts_lepton-upcfg.in (+17 lines)
	1	--- utils/scripts/lepton-upcfg.in.orig 2020-03-25 12:47:33 UTC
	2	+++ utils/scripts/lepton-upcfg.in
	3	@@ -219,7 +219,13 @@ Lepton EDA homepage: <~a>
	4	)
	5
	6
	7	- ( upcfg-log "ii: upgrading config in [~a]...~%" (config-file-path cfg-id) )
	8	+ ( upcfg-log
	9	+ "ii: upgrading config in [~a]...~%"
	10	+ ( if cfg-id
	11	+ ( config-file-path cfg-id ) ; if
	12	+ ( list-ref files 0 ) ; else
	13	+ )
	14	+ )
	15
	16	( if ( null? files )
	17	( or (config-upgrade cfg-id #:copy copy #:overwrite overwrite) (failure) ) ; if