diff --git a/srcpkgs/lxappearance/patches/fix-wayland.patch b/srcpkgs/lxappearance/patches/fix-wayland.patch deleted file mode 100644 index b878c1f0552..00000000000 --- a/srcpkgs/lxappearance/patches/fix-wayland.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit df82dc59c7b3ef5fa65898cbdd459d1fb8f3c9bf -Author: q66 -Date: Mon Feb 15 19:45:23 2021 +0100 - - fix segfault under wayland - -diff --git src/lxappearance.c src/lxappearance.c -index a4b7db3..b6441ae 100644 ---- a/src/lxappearance.c -+++ b/src/lxappearance.c -@@ -86,6 +86,10 @@ static gboolean check_lxde_dbus() - - static void check_lxsession() - { -+ /* on wayland, avoid touching X bits */ -+ if (g_getenv("WAYLAND_DISPLAY")) -+ return; -+ - lxsession_atom = XInternAtom( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "_LXSESSION", True ); - if( lxsession_atom != None ) - { diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template index 7fcaad225f8..4fb90179400 100644 --- a/srcpkgs/lxappearance/template +++ b/srcpkgs/lxappearance/template @@ -1,22 +1,22 @@ # Template file for 'lxappearance' pkgname=lxappearance -version=0.6.3 -revision=5 +version=0.6.4 +revision=1 build_style=gnu-configure configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config intltool automake libtool gettext-devel glib-devel" makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) $(vopt_if dbus dbus-glib-devel)" depends="desktop-file-utils" short_desc="LXDE Theme Switcher" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://lxde.org/" -distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz" -checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38 +distfiles="https://github.com/lxde/lxappearance/archive/refs/tags/${version}.tar.gz" +checksum=9f067a8a126b9779ba12648c76136d9ba3e7ec7920c568df7819d128fdf39e03 build_options="gtk3 dbus" build_options_default="dbus gtk3" -post_patch() { - vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure +pre_configure() { + autoreconf -fi }