From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- sci-electronics/geda/Manifest | 5 ++ .../geda/files/geda-1.10.2-drop-xorn.patch | 60 +++++++++++++ .../geda/files/geda-1.10.2-fix-gtk-sheet.patch | 15 ++++ sci-electronics/geda/geda-1.10.2-r1.ebuild | 97 +++++++++++++++++++++ sci-electronics/geda/geda-1.10.2-r2.ebuild | 99 ++++++++++++++++++++++ 5 files changed, 276 insertions(+) create mode 100644 sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch create mode 100644 sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch create mode 100644 sci-electronics/geda/geda-1.10.2-r1.ebuild create mode 100644 sci-electronics/geda/geda-1.10.2-r2.ebuild (limited to 'sci-electronics/geda') diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest index 4ea1cf868f68..babb809eba58 100644 --- a/sci-electronics/geda/Manifest +++ b/sci-electronics/geda/Manifest @@ -1,5 +1,10 @@ +AUX geda-1.10.2-drop-xorn.patch 1958 BLAKE2B 874d2457d1589fd6a5f0eabea50b8ecda860a3e4b29df748077cb855f9da9d693ef2036497562430d9d70c3c6bb7a8746ca2b46da784d37bc5228531370a2971 SHA512 6deacf5624fde0dcb9ed0059e63a23b44cffeb35975e8a2d3872a6cdb878625207e4c168f9a88a7fca848f23be1b128f2377701b57d651e9b05cd264ece76ca7 +AUX geda-1.10.2-fix-gtk-sheet.patch 431 BLAKE2B 47a72f0b16a90398c03f0c37fbdbd357a612d4896c2274e498606b5a69ea970598687965416e6ab62d5d2187851aeebd0bf96d530ab4094ac33e9080fa90bf3e SHA512 7b21ab5a23589b6fc4bbcea851f6f1c1c64cb02ee0a914e6533721d057e06f491a6c9787f1408974845672b526027ef47361e8b20c7cb3df050d18912e121a47 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.10.2.tar.gz 14441491 BLAKE2B d6ecc4bc1390ff457396ae406fdeee909418f63d8c50e537215fa0a1131cfda91339f44ddc2c91ca0f3772f4416be1c4448fea45336c78bb601fb9b4df399b14 SHA512 c7beabf019762d9d3b4faa63f1345fb064ebbb6e0203a6c5bcab6b740d20db9f3cedf85c2f99e3ab1cb5396c06886fad1dbd5201eb7bad9e77c03511cf23b1a1 DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3 +EBUILD geda-1.10.2-r1.ebuild 2228 BLAKE2B b29c878b05ffe7879b7107d546071044d7dbb790d7e1a18b9afe1d255babd4235f9df75eb47cbb3566c134f30fc2466c7e6e4cd54b0ec45223e39acf415f4b4d SHA512 361ab53aeb6bd90b6430cdff30ce308ef97a734d6a968b330f9a07085c4640729eb626a50a411a06f81123d50973d512a02e50bbb89bc46ca5ba05c4441f4755 +EBUILD geda-1.10.2-r2.ebuild 2278 BLAKE2B 5c46a6f5dee7ec8fb0aa66f0faef04aee88c9a4fe263a63af035aec2d25e2d90eb08ebcffbb0cfa7524fe1c096f6a204d8abe8016e800faaffa9ba71694b0142 SHA512 f4f1db56808bfcba4db18810e8e323d49f47296c1fd443c95c50ae8e9567c22319477aa87a11bb01b8b2277630c3766398837dc9da9cb34579ab6a1b12dd176e EBUILD geda-1.9.2-r1.ebuild 2031 BLAKE2B 209413b23a328e3924aee86909adb88ae59cf0b4c2462d9f9f1e000c6718b5742da39a54b75aae7f8aca6c72448577fbfd94d443559927da972967f5dce5b025 SHA512 f6267b9a7ef7a995de3e83abcd2b1f72a2de51d194d29eb9a8cae3291921ce2ea3e5588b9edf5c89d33dbd70d7d57090b3aa1ff0c83540b94a2f1df608ac7ed8 MISC metadata.xml 1108 BLAKE2B 4a11952f3543eac02bd65619442e3dd333c550c93969e5c8032d8f478b19a37763f23d353b9f7bd6b61783c70c5eafce10e493e5fd3a594edcdf93dba926d766 SHA512 9f4527cce78e7e5a69c7cd3f655be7f51f23eed736e94f63ec84dfe19ed7b409512e357f4008a2271f42f4d96c6b86a5aeb244efd6ce10d6a3bbeeb8f65be2d2 diff --git a/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch b/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch new file mode 100644 index 000000000000..f1532677bd53 --- /dev/null +++ b/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch @@ -0,0 +1,60 @@ +diff --git a/Makefile.am b/Makefile.am +index 161083c..d54eded 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,7 @@ if ENABLE_GATTRIB + GATTRIB_DIR=gattrib + endif + SUBDIRS = libgeda libgedacairo gaf gschem ${GATTRIB_DIR} \ +- gsymcheck gnetlist-legacy utils symbols docs examples contrib xorn ++ gsymcheck gnetlist-legacy utils symbols docs examples contrib + + ACLOCAL_AMFLAGS = -I m4 + +diff --git a/Makefile.in b/Makefile.in +index 31778d8..59789e6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -180,7 +180,7 @@ ETAGS = etags + CTAGS = ctags + CSCOPE = cscope + DIST_SUBDIRS = libgeda libgedacairo gaf gschem gattrib gsymcheck \ +- gnetlist-legacy utils symbols docs examples contrib xorn ++ gnetlist-legacy utils symbols docs examples contrib + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-tools/ar-lib \ + $(top_srcdir)/build-tools/compile \ +@@ -454,7 +454,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + @ENABLE_GATTRIB_TRUE@GATTRIB_DIR = gattrib + SUBDIRS = libgeda libgedacairo gaf gschem ${GATTRIB_DIR} \ +- gsymcheck gnetlist-legacy utils symbols docs examples contrib xorn ++ gsymcheck gnetlist-legacy utils symbols docs examples contrib + + ACLOCAL_AMFLAGS = -I m4 + +diff --git a/autogen.sh b/autogen.sh +index 7b82f04..4d81174 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -225,4 +225,4 @@ fi + run_tool "$AUTOHEADER" && + run_tool "$AUTOMAKE" -Wall --copy --add-missing --gnu && + run_tool "$AUTOCONF" && +- (cd xorn && autoreconf -if)) ++ ) + + ##################################################################### +diff --git a/configure.ac b/configure.ac +index 1f19064..257ee20 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -197,8 +197,6 @@ AX_LIBGEDACAIRO([1:3:0]) + export GEDADATADIR + export GEDARCDIR + +-AC_CONFIG_SUBDIRS([xorn]) +- + ##################################################################### + # Generate output + ##################################################################### diff --git a/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch b/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch new file mode 100644 index 000000000000..d351b84b390f --- /dev/null +++ b/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/834834 +From: Maciej S. Szmigiero +--- a/gattrib/src/gtksheet_2_2.c ++++ b/gattrib/src/gtksheet_2_2.c +@@ -8102,7 +8102,9 @@ + return; + } + +- gtk_sheet_get_cell_area(sheet, row, col, &area); ++ if (!gtk_sheet_get_cell_area(sheet, row, col, &area)) ++ return; ++ + child = gtk_sheet_put(sheet, widget, area.x, area.y); + child->attached_to_cell = TRUE; + child->row = row; diff --git a/sci-electronics/geda/geda-1.10.2-r1.ebuild b/sci-electronics/geda/geda-1.10.2-r1.ebuild new file mode 100644 index 000000000000..314a941f9a7f --- /dev/null +++ b/sci-electronics/geda/geda-1.10.2-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + media-gfx/imagemagick + virtual/latex-base +" +inherit autotools docs 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}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug examples fam nls" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + 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 + nls? ( virtual/libintl ) + fam? ( app-admin/gamin ) +" + +DEPEND="${RDEPEND} + dev-util/desktop-file-utils + x11-misc/shared-mime-info" +BDEPEND=" + sys-apps/groff + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +# Xorn requires python2 +PATCHES=( + "${FILESDIR}/${P}-drop-xorn.patch" +) + +src_prepare() { + default + rm -r xorn || die + + if ! use doc ; then + sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die + fi + if ! use examples ; then + sed -i -e 's/\texamples$//' Makefile.in || die + fi + + # add missing GIO_LIB Bug #684870 + sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \ + gsymcheck/src/Makefile.am || die + + sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \ + gnetlist-legacy/src/Makefile.am || die + + sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \ + utils/gschlas/Makefile.am || die + + sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \ + contrib/sarlacc_schem/Makefile.am || die + + # remove compressed files, compressed by portage in install phase + rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die + rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die + rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die + + eautoreconf +} + +src_configure() { + local myconf=( + --disable-rpath + --disable-update-xdg-database + $(use_enable doc doxygen) + $(use_enable debug assert) + $(use_enable nls) + $(use_with fam libfam) + ) + + econf "${myconf[@]}" +} diff --git a/sci-electronics/geda/geda-1.10.2-r2.ebuild b/sci-electronics/geda/geda-1.10.2-r2.ebuild new file mode 100644 index 000000000000..a1e9c74fae8e --- /dev/null +++ b/sci-electronics/geda/geda-1.10.2-r2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + media-gfx/imagemagick + virtual/latex-base +" +inherit autotools docs 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}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug examples fam nls" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + 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 + nls? ( virtual/libintl ) + fam? ( app-admin/gamin ) +" + +DEPEND="${RDEPEND} + dev-util/desktop-file-utils + x11-misc/shared-mime-info" +BDEPEND=" + sys-apps/groff + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + # Xorn requires python2 + "${FILESDIR}/${P}-drop-xorn.patch" + + "${FILESDIR}/${PN}-1.10.2-fix-gtk-sheet.patch" +) + +src_prepare() { + default + rm -r xorn || die + + if ! use doc ; then + sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die + fi + if ! use examples ; then + sed -i -e 's/\texamples$//' Makefile.in || die + fi + + # add missing GIO_LIB Bug #684870 + sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \ + gsymcheck/src/Makefile.am || die + + sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \ + gnetlist-legacy/src/Makefile.am || die + + sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \ + utils/gschlas/Makefile.am || die + + sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \ + contrib/sarlacc_schem/Makefile.am || die + + # remove compressed files, compressed by portage in install phase + rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die + rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die + rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die + + eautoreconf +} + +src_configure() { + local myconf=( + --disable-rpath + --disable-update-xdg-database + $(use_enable doc doxygen) + $(use_enable debug assert) + $(use_enable nls) + $(use_with fam libfam) + ) + + econf "${myconf[@]}" +} -- cgit v1.2.3