diff options
author | Jakob Hauser <jahau@rocketmail.com> | 2024-03-26 23:30:48 +0100 |
---|---|---|
committer | J0WI <1715-J0WI@users.gitlab.alpinelinux.org> | 2024-04-17 23:45:29 +0000 |
commit | 15c42c6eb6f2aab4e075dab03da5e9f45e6f66ea (patch) | |
tree | 5bc7cfb2af18d603150f37b6adc12f4f1459474e | |
parent | 9186fb0823e6eb48e21768874103abd6dcfe8ec6 (diff) |
"gnome-common" is deprecated. The patch allows to remove that dependency.
Instead, new dependency "intltool" becomes necessary.
The patch is already merged in upstream "slick-greeter" but there is no new
release available yet.
-rw-r--r-- | testing/slick-greeter/APKBUILD | 9 | ||||
-rw-r--r-- | testing/slick-greeter/get-rid-of-gnome-common.patch | 84 |
2 files changed, 90 insertions, 3 deletions
diff --git a/testing/slick-greeter/APKBUILD b/testing/slick-greeter/APKBUILD index 06759974c0f..0e6f9124030 100644 --- a/testing/slick-greeter/APKBUILD +++ b/testing/slick-greeter/APKBUILD @@ -2,15 +2,17 @@ # Maintainer: David Demelier <markand@malikania.fr> pkgname=slick-greeter pkgver=2.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="a slick-looking LightDM greeter" url="https://github.com/linuxmint/slick-greeter" # s390x: mainframe arch="all !s390x" license="GPL-3.0-only" -makedepends="automake autoconf libtool libcanberra-dev lightdm-dev gnome-common vala xapp-dev" +makedepends="automake autoconf intltool libtool libcanberra-dev lightdm-dev vala xapp-dev" subpackages="$pkgname-doc $pkgname-lang" -source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/slick-greeter/archive/refs/tags/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/slick-greeter/archive/refs/tags/$pkgver.tar.gz + get-rid-of-gnome-common.patch + " options="!check" # No tests prepare() { @@ -35,4 +37,5 @@ package() { sha512sums=" db6424e68f547d95fb67c835a8e2a842232cadf92fbded7a329c9e4ed8fd9588ee0914c92a7f11b97d28859e3a8ef2885b6b4cea73214d5693074397edbb7279 slick-greeter-2.0.3.tar.gz +1060172686538ad92f58abb7be80cdc99a6fd914e16700c4ea4d95a99abf09f82a05181961961732adce1d505787f93aa73d744e12c8e019e084fef5b28f8081 get-rid-of-gnome-common.patch " diff --git a/testing/slick-greeter/get-rid-of-gnome-common.patch b/testing/slick-greeter/get-rid-of-gnome-common.patch new file mode 100644 index 00000000000..5b626a9c5f3 --- /dev/null +++ b/testing/slick-greeter/get-rid-of-gnome-common.patch @@ -0,0 +1,84 @@ +From 52a1b5970534790becd977894545cacee92d2552 Mon Sep 17 00:00:00 2001 +From: Jakko3 <jahau@rocketmail.com> +Date: Mon, 12 Feb 2024 20:02:51 +0100 +Subject: [PATCH] Get rid of gnome-common build dependency (#231) + +"gnome-common" is deprecated. Replace the autogen.sh script by the +template suggested at the gnome-common migration page [1], adding +the mentioned aclocal line. + +[1] https://wiki.gnome.org/Projects/GnomeCommon/Migration +--- + autogen.sh | 45 ++++++++++++++++++++++++++++++++------------- + debian/control | 1 - + 2 files changed, 32 insertions(+), 14 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 7ac1a76..efc3e5f 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,20 +1,39 @@ + #!/bin/sh + # Run this to generate all the initial makefiles, etc. ++test -n "$srcdir" || srcdir=$(dirname "$0") ++test -n "$srcdir" || srcdir=. + +-srcdir=`dirname $0` +-test -z "$srcdir" && srcdir=. ++olddir=$(pwd) + +-REQUIRED_AUTOMAKE_VERSION=1.7 ++cd $srcdir + +-(test -f $srcdir/configure.ac \ +- && test -d $srcdir/src) || { +- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" +- echo " top-level slick-greeter directory" +- exit 1 ++(test -f configure.ac) || { ++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" ++ exit 1 + } + +-which gnome-autogen.sh || { +- echo "You need to install gnome-common from the GNOME CVS" +- exit 1 +-} +-. gnome-autogen.sh ++# shellcheck disable=SC2016 ++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) ++ ++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then ++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 ++ echo "*** If you wish to pass any to it, please specify them on the" >&2 ++ echo "*** '$0' command line." >&2 ++ echo "" >&2 ++fi ++ ++aclocal --install || exit 1 ++autoreconf --verbose --force --install || exit 1 ++ ++cd "$olddir" ++if [ "$NOCONFIGURE" = "" ]; then ++ $srcdir/configure "$@" || exit 1 ++ ++ if [ "$1" = "--help" ]; then ++ exit 0 ++ else ++ echo "Now type 'make' to compile $PKG_NAME" || exit 1 ++ fi ++else ++ echo "Skipping configure process." ++fi +diff --git a/debian/control b/debian/control +index 8bff7bd..5340245 100644 +--- a/debian/control ++++ b/debian/control +@@ -6,7 +6,6 @@ Standards-Version: 4.6.1 + Build-Depends: debhelper-compat (= 12), + at-spi2-core, + dbus-x11, +- gnome-common, + fonts-ubuntu, + libcanberra-dev, + libgtk-3-dev, |