From d66ad1a8c31b1b550be5d2c9769cc0467bb77c26 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 20:11:23 +0200 Subject: [PATCH 1/4] cairo-dock-plugins: replace vte290 with vte3. --- srcpkgs/cairo-dock-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template index 7069ed9ed64d..6bb439f1b5df 100644 --- a/srcpkgs/cairo-dock-plugins/template +++ b/srcpkgs/cairo-dock-plugins/template @@ -6,7 +6,7 @@ build_style=cmake hostmakedepends="gettext pkg-config" makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel libical-devel libxklavier-devel zeitgeist-devel libsensors-devel vala-devel - cairo-dock-devel gnome-menus-devel vte290-devel python3-devel upower-devel" + cairo-dock-devel gnome-menus-devel vte3-devel python3-devel upower-devel" depends="cairo-dock>=${version} upower" short_desc="Plugins for cairo-dock" maintainer="Orphaned " From 78348ba072506d44e33eb015ab768ad356c5caa1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 20:19:05 +0200 Subject: [PATCH 2/4] nemiver: replace vte290 with vte3. This commit also fixes issues with xlint. --- srcpkgs/nemiver/template | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template index 8c6f02c6b0c6..947ef8352a17 100644 --- a/srcpkgs/nemiver/template +++ b/srcpkgs/nemiver/template @@ -1,22 +1,26 @@ -# Template build file for 'nemiver'. +# Template file for 'nemiver' pkgname=nemiver version=0.9.6 -revision=4 -lib32disabled=yes +revision=5 build_style=gnu-configure configure_args="--disable-static --enable-gsettings=yes --disable-schemas-install --disable-schemas-compile" -depends="gdb gsettings-desktop-schemas" +hostmakedepends="pkg-config gdb intltool itstool glib-devel" makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel ghex-devel - gtksourceviewmm-devel vte290-devel gsettings-desktop-schemas-devel + gtksourceviewmm-devel vte3-devel gsettings-desktop-schemas-devel libgdlmm-devel" -hostmakedepends="pkg-config gdb intltool itstool glib-devel" +depends="gdb gsettings-desktop-schemas" short_desc="Graphical front-end for gdb" maintainer="Enno Boland " +license="GPL-2.0-only" homepage="https://wiki.gnome.org/Apps/Nemiver" -license="GPL-2" distfiles="https://download.gnome.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2 +lib32disabled=yes + +pre_configure() { + cp data/nemiver.appdata.xml data/nemiver.appdata.xml.in +} post_install() { rm -rf ${DESTDIR}/usr/include From 6a7d9c3143f9afbac55f2d22574bcbf9f578b5a3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 20:27:56 +0200 Subject: [PATCH 3/4] removed-packages: add vte290 --- srcpkgs/removed-packages/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 163647c10e49..7e5d660788ad 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=42 +revision=43 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -292,6 +292,8 @@ replaces=" vte<=0.28.2_16 vte-devel<=0.28.2_16 vte-python<=0.28.2_16 + vte290-devel<=0.36.5_5 + vte290<=0.36.5_5 wireguard-go<=0.0.20181222_2 wireshark-gtk<=3.0.7_1 libxnoise<=0.2.21_4 From f9d3d4e115ea3a1ffae04327ab9eaeef97c9f3a8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 20:29:44 +0200 Subject: [PATCH 4/4] vte290: removed, obsolete. use vte3 instead --- srcpkgs/vte290-devel | 1 - srcpkgs/vte290/template | 47 ----------------------------------------- srcpkgs/vte290/update | 2 -- 3 files changed, 50 deletions(-) delete mode 120000 srcpkgs/vte290-devel delete mode 100644 srcpkgs/vte290/template delete mode 100644 srcpkgs/vte290/update diff --git a/srcpkgs/vte290-devel b/srcpkgs/vte290-devel deleted file mode 120000 index 1c5ff05369a4..000000000000 --- a/srcpkgs/vte290-devel +++ /dev/null @@ -1 +0,0 @@ -vte290 \ No newline at end of file diff --git a/srcpkgs/vte290/template b/srcpkgs/vte290/template deleted file mode 100644 index c030b2c06b45..000000000000 --- a/srcpkgs/vte290/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'vte290' -pkgname=vte290 -version=0.36.5 -revision=5 -wrksrc=vte-${version} -build_style=gnu-configure -build_helper="gir" -configure_args="--with-gtk=3.0 --disable-gnome-pty-helper --disable-static - $(vopt_enable gir introspection) $(vopt_enable gir vala)" -hostmakedepends="glib-devel intltool pkg-config - $(vopt_if gir 'gobject-introspection vala-devel')" -makedepends="gtk+3-devel ncurses-devel" -short_desc="Terminal widget with improved accessibility and I18N support" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=c2c2ce9640f08b07667f1037862fe991081495446b735c0afb98f45e35b64edf - -# Fix musl build -CFLAGS="-D_GNU_SOURCE" -# Package build options -build_options="gir" -build_options_default="gir" - -post_patch() { - vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure -} - -post_install() { - # Rename conflicting file - mv ${DESTDIR}/etc/profile.d/{vte,vte290}.sh -} - -vte290-devel_package() { - depends="gtk+3-devel vte290>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - vmove usr/share/gtk-doc - } -} diff --git a/srcpkgs/vte290/update b/srcpkgs/vte290/update deleted file mode 100644 index d7d8a504da78..000000000000 --- a/srcpkgs/vte290/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname=vte -ignore="[!0].* 0.[!3]* 0.3[!6]*"