From nobody Thu Feb 23 13:23:15 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PMtxv4qM7z3tkQc; Thu, 23 Feb 2023 13:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PMtxv4Lb4z4G37; Thu, 23 Feb 2023 13:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677158595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rKaO1rcSaVNCR8R7mUyDVb3zKg+G3qVb9ty3b0/z59w=; b=dZQjFjn8IAcsk1FHhMA8jARXKDYI66IByBGy9ixw22ug9cCE+zvN6WM93kytZZCDhVWDIy PlfPOk4rcW2t1UGIaS49fLDdJdMrw/PkMLn11mFlVG5QVXzvjey0272yJb6TT51vS+O/hz vVcYB6YAx6i4ljAvk2XDn8XZDysIcNOqVElsQDvEGRvhLAJ08fdrY2Dvne9dimnvG0O1vw hJUoaWMi4kgFV261G/e8mbNd2bdw1oNf3JEXx9ZnVEd/cvUFG79YaYgjyDd1LUOguB0u7a MfquDbC0OpNQkMqg0CYDLcoAkfIQpIjMshCQp5JNsbcJieLTz5k8aCfMLWH/Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677158595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rKaO1rcSaVNCR8R7mUyDVb3zKg+G3qVb9ty3b0/z59w=; b=G1wXQqzttMJID/XAXiqUoQ38VjVM4L1PmQh+WPYysnsA2kOnMrLjArWOqIorRMWa+7JG1s 9syzvHkSuPdislxVGTxlzBTgkW3qGw59o26ldyoTWJzW8Cm5PoiEBlbz2HA/jXoxPat6aQ /rbl+YetFbqBKX9ysHuHG1W//b6Q5sJly/KiFOE+PLMrZ0l6POukjnPWN6xZNCF9tR8Qcw zKUdMd00pCovUl9qa2WCNzMoVf8RjRnrmvTpbpOtd171OqmlY/11695sXbsKF1GAcCIksr jsqk4aptDBomjE8Hx1HfA+lsi1fl7jIItHXFluy+eS83oTVp0vzbx9XhzcaHNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677158595; a=rsa-sha256; cv=none; b=VSN9hGciLR7NeFonIlpRn1P4xBqw22SK3KmCb4hn7Ev9T0/pgKSkHYIP2QY5fsaC9XqlHv lEAD4Fyav0tRgc38ct8E1uHPNYnmmfKGdiD6n99kjox4WwVIjxgqj/w3+ZExYM0ANqfXm+ 6Y/Sy0dHqZa+3nLkmd8Iup/rDEkJjyPT10Nglu/ouh9/mG/BysfDSAeqfv2wnbMvUNzJAU 3CaBvSzC7qyzkcltvSeME1edansuJccog+9eEup64E9FzNIU3fgSSzhiBeJUng5TAuquGK CwoxUZs5kSGsxkaXq9Hj5jbeA++e299zLIu+TmxzH+8yjlDsWSQlNmt3nO2VGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PMtxv3QwBzkL9; Thu, 23 Feb 2023 13:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31NDNFqB089168; Thu, 23 Feb 2023 13:23:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NDNFog089167; Thu, 23 Feb 2023 13:23:15 GMT (envelope-from git) Date: Thu, 23 Feb 2023 13:23:15 GMT Message-Id: <202302231323.31NDNFog089167@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: e3df77b3abbd - main - cad/geda: make the port's code consumable by contemporary compilers List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3df77b3abbd33bed8c5c7cacad4a3a242bde13f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3df77b3abbd33bed8c5c7cacad4a3a242bde13f commit e3df77b3abbd33bed8c5c7cacad4a3a242bde13f Author: Alexey Dokuchaev AuthorDate: 2023-02-23 13:20:00 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-02-23 13:20:00 +0000 cad/geda: make the port's code consumable by contemporary compilers Ensure that there is only one variable definition per each object, as the C (and C++) standards mandated for years and compilers started to enforce as of recently (Clang 11, GCC 10). --- cad/geda/files/patch-gattrib_include_globals.h | 45 +++++++++++++++++++++++ cad/geda/files/patch-gattrib_src_gtksheet__2__2.c | 19 ++++++++++ cad/geda/files/patch-gschem_include_globals.h | 11 ++++++ cad/geda/files/patch-gschem_src_x__menus.c | 10 +++++ 4 files changed, 85 insertions(+) diff --git a/cad/geda/files/patch-gattrib_include_globals.h b/cad/geda/files/patch-gattrib_include_globals.h new file mode 100644 index 000000000000..718645dda80a --- /dev/null +++ b/cad/geda/files/patch-gattrib_include_globals.h @@ -0,0 +1,45 @@ +--- gattrib/include/globals.h.orig 2013-08-18 17:02:48 UTC ++++ gattrib/include/globals.h +@@ -76,7 +76,7 @@ + * structs.h + */ + /*------------------------------------------------------------------*/ +-TOPLEVEL *pr_current; ++extern TOPLEVEL *pr_current; + + /*------------------------------------------------------------------*/ + /*! +@@ -85,7 +85,7 @@ TOPLEVEL *pr_current; + * callbacks. It is defined in structs.h + */ + /*------------------------------------------------------------------*/ +-SHEET_DATA *sheet_head; ++extern SHEET_DATA *sheet_head; + + /*------------------------------------------------------------------ + * GTKsheet includes: stuff for dealing with windows. +@@ -94,18 +94,14 @@ SHEET_DATA *sheet_head; + #define DEFAULT_SPACE 8 + #define NUM_SHEETS 3 /* Components, Nets, and Pins */ + +-GtkWidget *window; /* Main window */ +-GtkWidget *notebook; ++extern GtkWidget *window; /* Main window */ ++extern GtkWidget *notebook; + +-GtkSheet **sheets; /* These are the spreadsheet widgets themselves */ ++extern GtkSheet **sheets; /* These are the spreadsheet widgets themselves */ + +-GtkWidget **scrolled_windows; +-GtkWidget *entry; +-GtkWidget *location; +-GtkWidget *left_button; +-GtkWidget *center_button; +-GtkWidget *right_button; +-GtkWidget *label; ++extern GtkWidget **scrolled_windows; ++extern GtkWidget *entry; ++extern GtkWidget *label; + + /* command line switch settings */ + extern int verbose_mode; diff --git a/cad/geda/files/patch-gattrib_src_gtksheet__2__2.c b/cad/geda/files/patch-gattrib_src_gtksheet__2__2.c new file mode 100644 index 000000000000..570f38d55957 --- /dev/null +++ b/cad/geda/files/patch-gattrib_src_gtksheet__2__2.c @@ -0,0 +1,19 @@ +--- gattrib/src/gtksheet_2_2.c.orig 2013-09-25 20:59:27 UTC ++++ gattrib/src/gtksheet_2_2.c +@@ -57,6 +57,16 @@ + #include "../include/prototype.h" /* function prototypes */ + #include "../include/globals.h" + ++TOPLEVEL *pr_current; ++SHEET_DATA *sheet_head; ++ ++GtkWidget *window; ++GtkWidget *notebook; ++GtkSheet **sheets; ++GtkWidget **scrolled_windows; ++GtkWidget *entry; ++GtkWidget *label; ++ + #ifdef HAVE_LIBDMALLOC + #include + #endif diff --git a/cad/geda/files/patch-gschem_include_globals.h b/cad/geda/files/patch-gschem_include_globals.h new file mode 100644 index 000000000000..d1f7c3773ede --- /dev/null +++ b/cad/geda/files/patch-gschem_include_globals.h @@ -0,0 +1,11 @@ +--- gschem/include/globals.h.orig 2013-08-18 17:02:48 UTC ++++ gschem/include/globals.h +@@ -27,7 +27,7 @@ + extern GList *global_window_list; + + /* Manager for recently used files */ +-GtkRecentManager *recent_manager; ++extern GtkRecentManager *recent_manager; + + /* colors */ + extern GdkColor white; diff --git a/cad/geda/files/patch-gschem_src_x__menus.c b/cad/geda/files/patch-gschem_src_x__menus.c new file mode 100644 index 000000000000..095d13c8f874 --- /dev/null +++ b/cad/geda/files/patch-gschem_src_x__menus.c @@ -0,0 +1,10 @@ +--- gschem/src/x_menus.c.orig 2013-09-25 20:59:27 UTC ++++ gschem/src/x_menus.c +@@ -58,6 +58,7 @@ static GtkItemFactoryEntry popup_items[] = { + {N_("/Up"), NULL, i_callback_hierarchy_up, 0, NULL}, + }; + ++GtkRecentManager *recent_manager; + int npopup_items = sizeof(popup_items) / sizeof(popup_items[0]); + + /*! \todo Finish function documentation!!!