From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- sci-electronics/geda/Manifest | 3 +- .../geda/files/geda-1.9.2-fno-common.patch | 97 ++++++++++++++++++++++ sci-electronics/geda/geda-1.9.2-r1.ebuild | 75 ++++++++--------- 3 files changed, 134 insertions(+), 41 deletions(-) create mode 100644 sci-electronics/geda/files/geda-1.9.2-fno-common.patch (limited to 'sci-electronics/geda') diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest index 9695eada93c0..34cf0cc7a05f 100644 --- a/sci-electronics/geda/Manifest +++ b/sci-electronics/geda/Manifest @@ -1,4 +1,5 @@ +AUX geda-1.9.2-fno-common.patch 2724 BLAKE2B afc18d971ea58df785025e9cdce22df967385e6f143320a3e48895bb97f720691d245e1b7da953459fc3dccddbef492c34233bc25194ee1b377bd6abd8af773e SHA512 566f77d5acacd4e0ebf0b27eca91e2482320b22f73d5561457f69d7eeff6e54b4bbb672602be271b2243b268d78a8b18506d1f7607a367dd9dc8eb497cd1da2b AUX geda-1.9.2-guile-2.2.patch 655 BLAKE2B 503f041c3217dc6eaccba95fe5044a88ef08d9e625c50cfbfdeba29e3bef68e341b8920d15aebf9e921dfe875d45bd9bc0d57f1683fa8a46b519a0affb9c97d6 SHA512 f6dd973626fc2717c4262d715dcb3fcaafacd5773cfadaeade292b4f637ae19f30e4a0338e41037ba403b9133e9670d434d6ac7d67dd4eace69bca98a9d0ed1c DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3 -EBUILD geda-1.9.2-r1.ebuild 2221 BLAKE2B 43d22a8e1279fd795d9cd6c173035a0a2025e994d087f06958d3e2f1b87e1f2eeb72bd1a21148e762ab00a2d93afa1dc9548cbac63a0a944d5e8b67d8722c8e0 SHA512 77baa2ffa664cd2b9ef3cfffb69da8a160ebe30e90de9238531e905d1bce2662cd8c245e88edb06859f97ff04e2f849433aac276db837a1448713504efdc54ce +EBUILD geda-1.9.2-r1.ebuild 2030 BLAKE2B 01616a213886c77073cb4433197f02d84963ef0e345ffa7ecb46c6f261e4ae5ac3c8b38207617f576c761eeea91083574f150c637154e0af06a12dfff03ac436 SHA512 cfc76469f26e5ac9f62f47206d47c7b0490f800020ac5561f301c9c16579545f1485e096d11660afa090a0f33f5130035fe969347a0ea0e939bc927b033da7b2 MISC metadata.xml 1107 BLAKE2B 480a8a14257044a580f952f3e1efd26a02133e0b1ac98cc35c2d11ff08e3515ec38593d773ea2a881e1e3301ea5e1e1785909cc3017e56adec34ee09e11689d6 SHA512 7c64ce6548bc555ace1023c79ae7f74ac90b285f1bcdc65302d6908079a3358b010100ee50d607fdd65321d297d28410041010ca9b1db6599e20dccf0470c2c6 diff --git a/sci-electronics/geda/files/geda-1.9.2-fno-common.patch b/sci-electronics/geda/files/geda-1.9.2-fno-common.patch new file mode 100644 index 000000000000..c509b42904a8 --- /dev/null +++ b/sci-electronics/geda/files/geda-1.9.2-fno-common.patch @@ -0,0 +1,97 @@ +--- a/gschem/include/globals.h ++++ b/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; +--- a/gschem/src/globals.c ++++ b/gschem/src/globals.c +@@ -28,6 +28,8 @@ + /* window list */ + GList *global_window_list = NULL; + ++GtkRecentManager *recent_manager = NULL; ++ + char *rc_filename = NULL; + char *output_filename = NULL; + +--- a/gattrib/include/globals.h ++++ b/gattrib/include/globals.h +@@ -88,7 +88,7 @@ + * structs.h + */ + /*------------------------------------------------------------------*/ +-TOPLEVEL *pr_current; ++extern TOPLEVEL *pr_current; + + /*------------------------------------------------------------------*/ + /*! +@@ -97,7 +97,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. +@@ -106,18 +106,18 @@ 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 *location; ++extern GtkWidget *left_button; ++extern GtkWidget *center_button; ++extern GtkWidget *right_button; ++extern GtkWidget *label; + + /* command line switch settings */ + extern int verbose_mode; +--- a/gattrib/src/globals.c ++++ b/gattrib/src/globals.c +@@ -34,6 +34,23 @@ + #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 *location; ++GtkWidget *left_button; ++GtkWidget *center_button; ++GtkWidget *right_button; ++GtkWidget *label; ++ + /* command line arguments */ + int verbose_mode=FALSE; //!< Reflects the value of the command line flag + int quiet_mode=FALSE; //!< Reflects the value of the command line flag diff --git a/sci-electronics/geda/geda-1.9.2-r1.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild index b0b3ffbf9992..c85d6f349778 100644 --- a/sci-electronics/geda/geda-1.9.2-r1.ebuild +++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild @@ -1,46 +1,47 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils xdg-utils gnome2-utils versionator +EAPI=7 + +inherit autotools xdg MY_PN=${PN}-gaf MY_P=${MY_PN}-${PV} DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package" HOMEPAGE="http://wiki.geda-project.org/geda:gaf" -SRC_URI="http://ftp.geda-project.org/${MY_PN}/unstable/v$(get_version_component_range 1-2)/${PV}/${MY_P}.tar.gz" +SRC_URI="http://ftp.geda-project.org/${MY_PN}/unstable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="debug doc examples nls stroke threads" -CDEPEND=" +RDEPEND=" dev-libs/glib:2 + dev-scheme/guile + sci-electronics/electronics-menu + x11-libs/cairo + x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango - >=x11-libs/cairo-1.2.0 - x11-libs/gdk-pixbuf - >=dev-scheme/guile-2.0.0 nls? ( virtual/libintl ) - stroke? ( >=dev-libs/libstroke-0.5.1 )" + stroke? ( dev-libs/libstroke )" -DEPEND="${CDEPEND} - sys-apps/groff +DEPEND="${RDEPEND} dev-util/desktop-file-utils - x11-misc/shared-mime-info + x11-misc/shared-mime-info" +BDEPEND=" + sys-apps/groff virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.16 )" - -RDEPEND="${CDEPEND} - sci-electronics/electronics-menu" - -S=${WORKDIR}/${MY_P} + nls? ( sys-devel/gettext )" -DOCS="AUTHORS NEWS README" +S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}"/${P}-guile-2.2.patch ) +PATCHES=( + "${FILESDIR}"/${P}-guile-2.2.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { default @@ -65,36 +66,30 @@ src_prepare() { sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \ contrib/sarlacc_schem/Makefile.am || die + rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die + eautoreconf } src_configure() { - econf \ - $(use_enable threads threads posix) \ - $(use_with stroke libstroke) \ - $(use_enable nls) \ - $(use_enable debug assert) \ - --disable-doxygen \ - --disable-rpath \ + local myconf=( + --disable-doxygen + --disable-rpath --disable-update-xdg-database + $(use_enable debug assert) + $(use_enable nls) + $(use_enable threads threads posix) + $(use_with stroke libstroke) + ) + + econf "${myconf[@]}" } src_test() { emake -j1 check } -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update +src_install() { + default + find "${ED}" -name '*.la' -delete || die } -- cgit v1.2.3