Received: from vps892.directvps.nl (ikke.info [178.21.113.177])
	by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 8271D781F06
	for <~alpine/aports@lists.alpinelinux.org>; Sun,  6 Dec 2020 16:18:06 +0000 (UTC)
Received: by vps892.directvps.nl (Postfix, from userid 1008)
	id 438C1440131; Sun,  6 Dec 2020 17:18:06 +0100 (CET)
Date: Sun, 6 Dec 2020 17:18:06 +0100
From: Kevin Daudt <kdaudt@alpinelinux.org>
To: Drew DeVault <sir@cmpwn.com>
Cc: ~alpine/aports@lists.alpinelinux.org
Subject: Re: [PATCH 5/5] testing/tilp: new aport
Message-ID: <X80EPrTpRuqK744s@alpha>
References: <20201206140248.844-1-sir@cmpwn.com>
 <20201206140248.844-5-sir@cmpwn.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20201206140248.844-5-sir@cmpwn.com>

On Sun, Dec 06, 2020 at 02:03:44PM +0000, Drew DeVault wrote:
> 
> ---
>  testing/tilp/APKBUILD                        | 29 +++++++++
>  testing/tilp/remove-broken-kde-support.patch | 68 ++++++++++++++++++++
>  2 files changed, 97 insertions(+)
>  create mode 100644 testing/tilp/APKBUILD
>  create mode 100644 testing/tilp/remove-broken-kde-support.patch
> 
> diff --git a/testing/tilp/APKBUILD b/testing/tilp/APKBUILD
> new file mode 100644
> index 0000000000..45ff4f120b
> --- /dev/null
> +++ b/testing/tilp/APKBUILD
> @@ -0,0 +1,29 @@
> +# Maintainer:
> +pkgname=tilp
> +pkgver=1.18
> +pkgrel=0
> +pkgdesc="TI graphing calculator link/transfer program"
> +url="http://lpg.ticalc.org/prj_tilp/"
> +arch="all"
> +license="GPL-2.0-only"
> +makedepends="bzip2 libticalcs-dev gtk+2.0-dev libtool"

Missing autoreconf

> +source="
> +	$pkgname-$pkgver.tar.bz2::http://downloads.sourceforge.net/project/tilp/tilp2-linux/tilp2-1.18/${pkgname}2-$pkgver.tar.bz2
> +	remove-broken-kde-support.patch
> +"
> +options="!check" # No upstream tests
> +builddir="$srcdir/${pkgname}2-$pkgver"
> +
> +build() {
> +	cd "$builddir"

redundant

> +	autoreconf -if
> +	./configure --prefix=/usr
> +}
> +
> +package() {
> +	make install DESTDIR="$pkgdir"
> +	rm -rf "$pkgdir"/usr/share/locale
> +}
> +
> +sha512sums="8e46337e1ac7de85d88d4cb677910a099cdb6d3f473cdf8ca751a45dd66410b11751cd4555116c9249aa53bd23105957b4b2af2247968ec840da68aeed105f5f  tilp-1.18.tar.bz2
> +f7e946ca41bbfe415adabd59d5dd8234af7049c8902a2abec0911db0014aed11374cd98e34cb65cad15261eaf1bbfbc4c3641217cdff6b6639c749557983d8b7  remove-broken-kde-support.patch"
> diff --git a/testing/tilp/remove-broken-kde-support.patch b/testing/tilp/remove-broken-kde-support.patch
> new file mode 100644
> index 0000000000..cd191ab047
> --- /dev/null
> +++ b/testing/tilp/remove-broken-kde-support.patch
> @@ -0,0 +1,68 @@
> +diff -aur --no-dereference package.pristine/configure.ac package.new/configure.ac
> +--- package.pristine/configure.ac	2016-01-15 21:28:52.000000000 +0100
> ++++ package.new/configure.ac	2017-05-30 23:56:19.028317110 +0200
> +@@ -118,22 +118,23 @@
> + CFLAGS="$CFLAGS $ARCH"
> + 
> + # KDE dialogs support
> +-AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
> +-if test "x$kde" = "xdefault"; then
> +-  case $host_os in
> +-    *mingw*)
> +-      kde=no
> +-      ;;
> +-    *)
> +-      kde=yes
> +-      ;;
> +-  esac
> +-fi
> +-if test "x$kde" = "xyes"; then
> +-        AC_PROG_CXX
> +-        AC_PATH_KDE
> +-        AC_DEFINE(WITH_KDE, 1, [Use KDE support])
> +-fi
> ++#AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
> ++#if test "x$kde" = "xdefault"; then
> ++#  case $host_os in
> ++#    *mingw*)
> ++#      kde=no
> ++#      ;;
> ++#    *)
> ++#      kde=yes
> ++#      ;;
> ++#  esac
> ++#fi
> ++#if test "x$kde" = "xyes"; then
> ++#        AC_PROG_CXX
> ++#        AC_PATH_KDE
> ++#        AC_DEFINE(WITH_KDE, 1, [Use KDE support])
> ++#fi
> ++kde=no
> + AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes")
> + AC_SUBST(kde)
> + 
> +diff -aur --no-dereference package.pristine/src/Makefile.am package.new/src/Makefile.am
> +--- package.pristine/src/Makefile.am	2016-03-14 20:55:57.000000000 +0100
> ++++ package.new/src/Makefile.am	2017-05-31 00:03:11.171739478 +0200
> +@@ -9,16 +9,16 @@
> + tilp_CPPFLAGS = -I$(top_srcdir)/intl \
> + 	@TICABLES_CFLAGS@ @TIFILES_CFLAGS@ @TICALCS_CFLAGS@ @TICONV_CFLAGS@ \
> + 	@GLIB_CFLAGS@ @GTK_CFLAGS@ \
> +-	@KDE_INCLUDES@ @QT_INCLUDES@ \
> + 	-DSHARE_DIR=\"$(pkgdatadir)\" \
> + 	-DLOCALEDIR=\"$(datadir)/locale\" \
> + 	-DSYSCONFDIR=\"$(sysconfdir)\" \
> + 	-DGTK_DISABLE_DEPRECATED
> ++#	@KDE_INCLUDES@ @QT_INCLUDES@
> + tilp_LDFLAGS = -export-dynamic
> + tilp_LDADD = @TICABLES_LIBS@ @TIFILES_LIBS@ @TICALCS_LIBS@ @TICONV_LIBS@ \
> +-	@GLIB_LIBS@ @GTK_LIBS@ \
> +-	@LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
> +-	@QT_LDFLAGS@ @X_LDFLAGS@ @LIBZ@
> ++	@GLIB_LIBS@ @GTK_LIBS@ @LIBZ@
> ++#	@LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
> ++#	@QT_LDFLAGS@ @X_LDFLAGS@
> + tilp_SOURCES = *.h \
> + 	tilp_calcs.c tilp_cmdline.c tilp_config.c tilp_error.c \
> + 	tilp_files.c tilp_gif.c tilp_main.c \
> +
> -- 
> 2.29.2