From dbe298623d270f79c7a44faaed09915ebcdd5145 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 4 Jan 2023 17:53:35 +0100 Subject: [PATCH] galculator: remove gtk2 subpackage --- srcpkgs/galculator-gtk2 | 2 +- srcpkgs/galculator-gtk3 | 1 + srcpkgs/galculator-gtk3/template | 51 -------------------------------- srcpkgs/galculator/template | 33 +++++++++++++++++++++ 4 files changed, 35 insertions(+), 52 deletions(-) create mode 120000 srcpkgs/galculator-gtk3 delete mode 100644 srcpkgs/galculator-gtk3/template create mode 100644 srcpkgs/galculator/template diff --git a/srcpkgs/galculator-gtk2 b/srcpkgs/galculator-gtk2 index cea449574866..1e29464e1bf8 120000 --- a/srcpkgs/galculator-gtk2 +++ b/srcpkgs/galculator-gtk2 @@ -1 +1 @@ -galculator-gtk3 \ No newline at end of file +galculator \ No newline at end of file diff --git a/srcpkgs/galculator-gtk3 b/srcpkgs/galculator-gtk3 new file mode 120000 index 000000000000..1e29464e1bf8 --- /dev/null +++ b/srcpkgs/galculator-gtk3 @@ -0,0 +1 @@ +galculator \ No newline at end of file diff --git a/srcpkgs/galculator-gtk3/template b/srcpkgs/galculator-gtk3/template deleted file mode 100644 index ccaab3aeb1b3..000000000000 --- a/srcpkgs/galculator-gtk3/template +++ /dev/null @@ -1,51 +0,0 @@ -# Template file for 'galculator-gtk3' -pkgname=galculator-gtk3 -version=2.1.4 -revision=2 -build_style=gnu-configure -hostmakedepends="automake flex gettext-devel glib-devel intltool libtool pkg-config" -makedepends="gtk+-devel gtk+3-devel" -short_desc="GTK+ based scientific calculator (GTK+3)" -maintainer="Aaditya Bagga " -license="GPL-2.0-or-later" -homepage="http://galculator.mnim.org/" -distfiles="https://github.com/${pkgname%-*}/${pkgname%-*}/archive/v${version}.tar.gz" -checksum=dcbdb48ddf8a3f68b9aa5902f880f174fd269de2b7410988148d05871012e142 - -provides="galculator-${version}_${revision}" -replaces="galculator-gtk2>=0" - -CFLAGS="-fcommon" - -pre_configure() { - mkdir -p gtk2 - mv * gtk2 || true - cp -a gtk2 gtk3 -} - -do_configure() { - # GTK+2 - cd ${wrksrc}/gtk2 - ./autogen.sh ${configure_args} --disable-gtk3 - # GTK+3 - cd ${wrksrc}/gtk3 - ./autogen.sh ${configure_args} --enable-gtk3 -} - -do_build() { - make ${makejobs} -C gtk2 - make ${makejobs} -C gtk3 -} - -do_install() { - make DESTDIR=${DESTDIR} -C ${wrksrc}/gtk3 install -} - -galculator-gtk2_package() { - short_desc="${short_desc/GTK+3/GTK+2}" - provides="galculator-${version}_${revision}" - replaces="galculator-gtk3>=0" - pkg_install() { - make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk2 install - } -} diff --git a/srcpkgs/galculator/template b/srcpkgs/galculator/template new file mode 100644 index 000000000000..20dddd4d4309 --- /dev/null +++ b/srcpkgs/galculator/template @@ -0,0 +1,33 @@ +# Template file for 'galculator' +pkgname=galculator +version=2.1.4 +revision=3 +build_style=gnu-configure +configure_args="--enable-gtk3" +hostmakedepends="automake flex gettext-devel glib-devel intltool libtool pkg-config" +makedepends="gtk+3-devel" +short_desc="GTK+ based scientific calculator (GTK+3)" +maintainer="Aaditya Bagga " +license="GPL-2.0-or-later" +homepage="http://galculator.mnim.org/" +distfiles="https://github.com/galculator/galculator/archive/v${version}.tar.gz" +checksum=dcbdb48ddf8a3f68b9aa5902f880f174fd269de2b7410988148d05871012e142 +make_check=no # FIXME + +CFLAGS="-fcommon" + +do_configure() { + ./autogen.sh ${configure_args} +} + +galculator-gtk3_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} + +galculator-gtk2_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +}