diff --git a/common/shlibs b/common/shlibs index 7c473a07603..31ff3ac5af8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2255,7 +2255,7 @@ libtesseract.so.4 tesseract-ocr-4.0.0_1 libffmpegthumbnailer.so.4 ffmpegthumbnailer-2.0.10_1 libopenraw.so.7 libopenraw-0.1.0_1 libopenrawgnome.so.7 libopenraw-0.1.0_1 -libgeda.so.46 geda-1.10.0_1 +libgeda.so.47 geda-1.10.1_1 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1 libgsound.so.0 gsound-1.0.1_1 libgegl-0.3.so.0 gegl3-0.3.0_1 diff --git a/srcpkgs/geda/patches/snarf_cpp_opts.patch b/srcpkgs/geda/patches/snarf_cpp_opts.patch index 1eec9b6f6db..733caa319a6 100644 --- a/srcpkgs/geda/patches/snarf_cpp_opts.patch +++ b/srcpkgs/geda/patches/snarf_cpp_opts.patch @@ -1,6 +1,6 @@ ---- gschem/src/Makefile.orig 2019-10-08 20:33:14.000000000 +0200 -+++ gschem/src/Makefile.in 2019-10-12 15:49:39.966600662 +0200 -@@ -2693,12 +2693,12 @@ +--- gschem/src/Makefile.am 2020-12-12 16:20:18.000000000 +0100 ++++ gschem/src/Makefile.am 2020-12-20 12:55:06.921054480 +0100 +@@ -152,12 +152,12 @@ $(AM_V_SNARF)CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts) actions.decl.x: actions.decl.h actions.c Makefile diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template index 3bdf38abe85..3758d466c15 100644 --- a/srcpkgs/geda/template +++ b/srcpkgs/geda/template @@ -1,11 +1,12 @@ # Template file for 'geda' pkgname=geda -version=1.10.0 -revision=4 +version=1.10.1 +revision=1 wrksrc="${pkgname}-gaf-${version}" build_style=gnu-configure configure_args="--disable-update-xdg-database" -hostmakedepends="pkg-config guile python desktop-file-utils shared-mime-info" +hostmakedepends="automake libtool pkg-config flex gettext-devel guile + groff python desktop-file-utils shared-mime-info tar texinfo" makedepends="gamin-devel gc-devel gtk+-devel guile-devel python-devel libatomic_ops-devel" depends="guile" checkdepends="perl" @@ -14,7 +15,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="http://www.geda-project.org/" distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz" -checksum=5eb7a619f9d9cbcfa895468d6eae888d7e1d519dfff717b9f8f22fbeb37a3b1a +checksum=76d282ddeebfb63da8d9b347951e67ce9282b9547df81bde4b46a3851eb13359 CFLAGS="-Wno-deprecated-declarations -fcommon" python_version=2 replaces="geda-data>=0" @@ -25,9 +26,12 @@ if [ "$CROSS_BUILD" ]; then fi fi +CFLAGS="-Wno-unused-function" + pre_configure() { mkdir -p gnu touch gnu/stubs-32.h + autoreconf -fi } post_install() { @@ -43,6 +47,7 @@ geda-devel_package() { vmove usr/include } } + geda-doc_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - documentation and exmaple files"