Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 6ADF6782B9C for <~alpine/aports@lists.alpinelinux.org>; Sun, 6 Dec 2020 21:18:15 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpwn.com; s=key1; t=1607289540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g3UwcfYDP9nlfSlUVeCwaGu6qkjWlH9iR29fT6hNp7c=; b=r+2qVzBSyjKWCF8HdVcv8YMpHVUs+zuE2ePLQDyDtcqE6QpbKpkpIViQorkrbjliVmaKdJ kpFBB6FSlYePuePhaKlIn2pvDJFPeYW7RPxsBFCnovlyezkgTny/S+AXZn5siMaVcDN4Ox 8aa+zdTc/NyFZ4QljJhajc5WPJXCaV1u4oJXR+U6LN1oF/YCobT6d+maBj4J+wQ0eDjhlO q0hdydWJPLoI6exFuDe30DZ6iTmt5lhK8uixwyPh8kZpggO0LKKnF1VA6Dxit3I0j/1YtX Qv4xo0mKumwCYN1eHtSrDZr9sdlJg0Tqisc3N8qTLUaO0bfDnwIgLbvqzVuNFQ== From: Drew DeVault To: ~alpine/aports@lists.alpinelinux.org Cc: Drew DeVault Subject: [PATCH v2 5/5] testing/tilp: new aport Message-Id: <20201206211800.20258-5-sir@cmpwn.com> In-Reply-To: <20201206211800.20258-1-sir@cmpwn.com> References: <20201206211800.20258-1-sir@cmpwn.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: sir@cmpwn.com Date: Sun, 06 Dec 2020 21:19:00 GMT --- testing/tilp/APKBUILD | 28 ++++++++ testing/tilp/remove-broken-kde-support.patch | 68 ++++++++++++++++++++ 2 files changed, 96 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..3979ce904b --- /dev/null +++ b/testing/tilp/APKBUILD @@ -0,0 +1,28 @@ +# Maintainer: Drew DeVault +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 autoconf automake" +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() { + 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