From 22c37ee7dd8aad95c7342a7b9737bdef52b6c437 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 7 Oct 2023 13:43:15 -0400 Subject: [PATCH 1/3] pcb: remove requires geda (python2) --- srcpkgs/pcb/template | 19 ------------------- srcpkgs/pcb/update | 1 - srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 srcpkgs/pcb/template delete mode 100644 srcpkgs/pcb/update diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template deleted file mode 100644 index f6db34b88e4b4..0000000000000 --- a/srcpkgs/pcb/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'pcb' -pkgname=pcb -reverts=20140316_4 -version=4.3.0 -revision=1 -build_style=gnu-configure -configure_args="--disable-update-desktop-database --disable-update-mime-database" -hostmakedepends="flex geda gerbv intltool netpbm pkg-config - desktop-file-utils tar texinfo tk" -makedepends="gd-devel gtkglext-devel tk-devel" -depends="geda gerbv" -checkdepends="ImageMagick ghostscript" -short_desc="Interactive printed circuit board editor" -maintainer="Orphaned " -license="GPL-2.0-or-later" -homepage="http://pcb.geda-project.org/news.html" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=ae852f46af84aba7f51d813fb916fc7fcdbeea43f7134f150507024e1743fb5e -replaces="pcb-data>=0" diff --git a/srcpkgs/pcb/update b/srcpkgs/pcb/update deleted file mode 100644 index 64555b2ec211a..0000000000000 --- a/srcpkgs/pcb/update +++ /dev/null @@ -1 +0,0 @@ -ignore="20*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 669234714539b..e7f583e6db2b0 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -449,6 +449,7 @@ replaces=" orage<=4.12.1_7 parallel-rust<=0.11.3_2 paraview<=5.8.1_3 + pcb<=4.3.0_1 pcsx2<=1.6.0_2 perl-Alien-wxWidgets<=0.69_3 perl-Gtk2-Ex-Simple-List<=0.50_4 From d2c1fc0f2cbec6f827be8c67fd297f03277b9ed6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 7 Oct 2023 13:44:32 -0400 Subject: [PATCH 2/3] gerbv: remove requires geda (python 2) --- srcpkgs/gerbv/template | 16 ---------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 srcpkgs/gerbv/template diff --git a/srcpkgs/gerbv/template b/srcpkgs/gerbv/template deleted file mode 100644 index 0898411efec10..0000000000000 --- a/srcpkgs/gerbv/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'gerbv' -pkgname=gerbv -version=2.7.0 -revision=3 -build_style=gnu-configure -configure_args="--disable-update-desktop-database --disable-rpath" -hostmakedepends="pkg-config glib-devel" -makedepends="cairo-devel gtk+-devel" -short_desc="Gerber (RS-274X) viewer" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="http://gerbv.geda-project.org" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=c5ee808c4230ce6be3ad10ab63c547098386d43022704de25ddb9378e62053b4 - -CFLAGS="-fcommon" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index e7f583e6db2b0..3d15fe17f51af 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -135,6 +135,7 @@ replaces=" gegl3<=0.3.28_2 gens-gs<=2.16.7_2 geoip-data<=20171002_2 + gerbv<=2.7.0_3 gespeaker<=0.8.6_3 geth<=1.10.1_2 getmail<=5.14_2 From f8bff0a00b3c5af38e6e1b86d68b42450d778f2f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 7 Oct 2023 13:50:25 -0400 Subject: [PATCH 3/3] geda: remove python 2, gtk 2 --- common/shlibs | 3 -- srcpkgs/geda-devel | 1 - srcpkgs/geda-doc | 1 - srcpkgs/geda/patches/snarf_cpp_opts.patch | 17 -------- srcpkgs/geda/template | 49 ----------------------- srcpkgs/geda/update | 2 - srcpkgs/removed-packages/template | 5 ++- 7 files changed, 4 insertions(+), 74 deletions(-) delete mode 120000 srcpkgs/geda-devel delete mode 120000 srcpkgs/geda-doc delete mode 100644 srcpkgs/geda/patches/snarf_cpp_opts.patch delete mode 100644 srcpkgs/geda/template delete mode 100644 srcpkgs/geda/update diff --git a/common/shlibs b/common/shlibs index 499e8f39052d2..e2b4433b694dc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2272,9 +2272,6 @@ 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.47 geda-1.10.1_1 -libgedacairo.so.1 geda-1.10.2_1 -libxornstorage.so.0 geda-1.10.2_1 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1 libgsound.so.0 gsound-1.0.1_1 libproc2.so.0 procps-ng-4.0.3_1 diff --git a/srcpkgs/geda-devel b/srcpkgs/geda-devel deleted file mode 120000 index bae9ec9144261..0000000000000 --- a/srcpkgs/geda-devel +++ /dev/null @@ -1 +0,0 @@ -geda \ No newline at end of file diff --git a/srcpkgs/geda-doc b/srcpkgs/geda-doc deleted file mode 120000 index bae9ec9144261..0000000000000 --- a/srcpkgs/geda-doc +++ /dev/null @@ -1 +0,0 @@ -geda \ No newline at end of file diff --git a/srcpkgs/geda/patches/snarf_cpp_opts.patch b/srcpkgs/geda/patches/snarf_cpp_opts.patch deleted file mode 100644 index e9eeb495887a1..0000000000000 --- a/srcpkgs/geda/patches/snarf_cpp_opts.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/gschem/src/Makefile.am 2020-12-12 16:20:18.000000000 +0100 -+++ b/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 -- $(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \ -+ $(AM_V_GEN)$(CPP) -I$(srcdir) $< | \ - sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \ - mv $@.tmp $@ - - actions.init.x: actions.init.c actions.c Makefile -- $(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \ -+ $(AM_V_GEN)$(CPP) -I$(srcdir) $< | \ - sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \ - mv $@.tmp $@ - diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template deleted file mode 100644 index 30ebb7a824ec6..0000000000000 --- a/srcpkgs/geda/template +++ /dev/null @@ -1,49 +0,0 @@ -# Template file for 'geda' -pkgname=geda -version=1.10.2 -revision=1 -build_style=gnu-configure -configure_args="--disable-update-xdg-database" -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" -short_desc="Electronic Design Automation tool" -maintainer="Orphaned " -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=e862ab241528538fa3bee2739261f568011102b60c5e39a2f0358663c042c8a4 -python_version=2 -replaces="geda-data>=0" - -CFLAGS="-Wno-deprecated-declarations -fcommon -Wno-unused-function" - -pre_configure() { - mkdir -p gnu - touch gnu/stubs-32.h - autoreconf -fi -} - -post_install() { - rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache -} - -geda-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - vmove usr/include - } -} - -geda-doc_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - documentation and exmaple files" - pkg_install() { - vmove usr/share/doc - } -} diff --git a/srcpkgs/geda/update b/srcpkgs/geda/update deleted file mode 100644 index 217d99824e404..0000000000000 --- a/srcpkgs/geda/update +++ /dev/null @@ -1,2 +0,0 @@ -pattern="/geda-gaf/stable/v[\d.]+/\K[\d.]+" -site="http://wiki.geda-project.org/geda:download" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 3d15fe17f51af..4007248f21838 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20231006 +version=0.1.20231008 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -132,6 +132,9 @@ replaces=" gconfmm-devel<=2.28.3_4 gconfmm-doc<=2.28.3_4 gconfmm<=2.28.3_4 + geda-devel<=1.10.2_1 + geda-doc<=1.10.2_1 + geda<=1.10.2_1 gegl3<=0.3.28_2 gens-gs<=2.16.7_2 geoip-data<=20171002_2