* Re: [PR PATCH] [Updated] Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
@ 2021-04-06 18:43 ` Gottox
2021-04-06 19:38 ` Chocimier
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gottox @ 2021-04-06 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages remove-vte290
https://github.com/void-linux/void-packages/pull/30052
Remove vte290
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30052.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-vte290-30052.patch --]
[-- Type: text/x-diff, Size: 8637 bytes --]
From a6fee541149a89253b9d416ee6c3719ff4b25e01 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:11:23 +0200
Subject: [PATCH 1/6] cairo-dock-plugins: replace vte290 with vte3.
---
srcpkgs/cairo-dock-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 1086ee328e40..abe9b42d32a3 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,12 +1,12 @@
# Template file for 'cairo-dock-plugins'
pkgname=cairo-dock-plugins
version=3.4.1
-revision=13
+revision=14
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 <orphan@voidlinux.org>"
From 41b4880edd3773d073bac26e59053299d4666f86 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:19:05 +0200
Subject: [PATCH 2/6] nemiver: replace vte290 with vte3.
---
srcpkgs/nemiver/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template
index 8c6f02c6b0c6..6b0f491734c0 100644
--- a/srcpkgs/nemiver/template
+++ b/srcpkgs/nemiver/template
@@ -1,14 +1,14 @@
# Template build file for 'nemiver'.
pkgname=nemiver
version=0.9.6
-revision=4
+revision=5
lib32disabled=yes
build_style=gnu-configure
configure_args="--disable-static --enable-gsettings=yes
--disable-schemas-install --disable-schemas-compile"
depends="gdb gsettings-desktop-schemas"
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"
short_desc="Graphical front-end for gdb"
@@ -18,6 +18,10 @@ license="GPL-2"
distfiles="https://download.gnome.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2
+pre_configure() {
+ cp data/nemiver.appdata.xml data/nemiver.appdata.xml.in
+}
+
post_install() {
rm -rf ${DESTDIR}/usr/include
}
From 3b55f38ede2eccd4e21ccb34725993e44a6fc738 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:27:56 +0200
Subject: [PATCH 3/6] 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 79e7c4d1c77e..9be4bf486f35 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=40
+revision=41
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -285,6 +285,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 9ee12987c3bb0713e880b98570e397f7e22ed085 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:29:44 +0200
Subject: [PATCH 4/6] 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 <orphan@voidlinux.org>"
-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]*"
From 364299f7d3658a06aa4e700a8e6676742b17b198 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:40:06 +0200
Subject: [PATCH 5/6] nemiver: fix xlint
---
srcpkgs/nemiver/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template
index 6b0f491734c0..947ef8352a17 100644
--- a/srcpkgs/nemiver/template
+++ b/srcpkgs/nemiver/template
@@ -1,22 +1,22 @@
-# Template build file for 'nemiver'.
+# Template file for 'nemiver'
pkgname=nemiver
version=0.9.6
revision=5
-lib32disabled=yes
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 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 <gottox@voidlinux.org>"
+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
From f06c06cd43675aac4247b2b9765516efaee33b25 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:43:07 +0200
Subject: [PATCH 6/6] cairo-dock-plugins: fix xlint (mostly)
---
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 abe9b42d32a3..beb4107ca728 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -10,7 +10,7 @@ makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
depends="cairo-dock>=${version} upower"
short_desc="Plugins for cairo-dock"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="https://launchpad.net/cairo-dock"
distfiles="http://launchpad.net/cairo-dock-plug-ins/${version%.?}/${version}/+download/cairo-dock-plug-ins-${version}.tar.gz"
checksum=e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
2021-04-06 18:43 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-06 19:38 ` Chocimier
2021-04-06 19:38 ` Chocimier
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Chocimier @ 2021-04-06 19:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/30052#issuecomment-814389101
Comment:
Putting libraries into removed-packages makes problematic to update systems that have the library, but no removed-packages yet. This can be avoided if replaces is fit into replacement we have here, vte3.
What about giggle?
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
2021-04-06 18:43 ` [PR PATCH] [Updated] " Gottox
2021-04-06 19:38 ` Chocimier
@ 2021-04-06 19:38 ` Chocimier
2021-04-06 20:26 ` Gottox
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Chocimier @ 2021-04-06 19:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/30052#issuecomment-814389101
Comment:
Putting libraries into removed-packages makes problematic to update systems that have the library, but no removed-packages yet. This can be avoided if replaces is put into replacement we have here, vte3.
What about giggle?
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (2 preceding siblings ...)
2021-04-06 19:38 ` Chocimier
@ 2021-04-06 20:26 ` Gottox
2021-04-06 20:27 ` Gottox
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gottox @ 2021-04-06 20:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/30052#issuecomment-814416724
Comment:
> Putting libraries into removed-packages makes problematic to update systems that have the library, but no removed-packages yet. This can be avoided if replaces is put into replacement we have here, vte3.
true. That's a better way.
> What about giggle?
You're right. `giggle` does not link depend on vte290. It's only used (or even not used) while building.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (3 preceding siblings ...)
2021-04-06 20:26 ` Gottox
@ 2021-04-06 20:27 ` Gottox
2021-04-07 7:22 ` Gottox
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gottox @ 2021-04-06 20:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/30052#issuecomment-814416724
Comment:
> Putting libraries into removed-packages makes problematic to update systems that have the library, but no removed-packages yet. This can be avoided if replaces is put into replacement we have here, vte3.
true. That's a better way.
> What about giggle?
You're right. `giggle` does not link depend on vte290. It's only used (or even not used) while building.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (4 preceding siblings ...)
2021-04-06 20:27 ` Gottox
@ 2021-04-07 7:22 ` Gottox
2021-04-18 22:14 ` ericonr
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gottox @ 2021-04-07 7:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/30052#issuecomment-814416724
Comment:
> Putting libraries into removed-packages makes problematic to update systems that have the library, but no removed-packages yet. This can be avoided if replaces is put into replacement we have here, vte3.
true. That's a better way.
> What about giggle?
You're right. `giggle` does not depend on vte290. It's only used (or even not used) while building.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (5 preceding siblings ...)
2021-04-07 7:22 ` Gottox
@ 2021-04-18 22:14 ` ericonr
2021-04-18 22:14 ` ericonr
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-04-18 22:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30052#issuecomment-822070674
Comment:
> srcpkgs/cairo-dock-plugins/template:35: do not set pycompile_module, it is autodetected
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (6 preceding siblings ...)
2021-04-18 22:14 ` ericonr
@ 2021-04-18 22:14 ` ericonr
2021-04-18 22:15 ` ericonr
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-04-18 22:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30052#issuecomment-822070674
Comment:
> srcpkgs/cairo-dock-plugins/template:35: do not set pycompile_module, it is autodetected
This has been fixed in another commit.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (7 preceding siblings ...)
2021-04-18 22:14 ` ericonr
@ 2021-04-18 22:15 ` ericonr
2021-04-20 9:44 ` [PR PATCH] [Updated] " Gottox
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-04-18 22:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30052#issuecomment-822070674
Comment:
> srcpkgs/cairo-dock-plugins/template:35: do not set pycompile_module, it is autodetected
Edit: this has been fixed in another commit.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (8 preceding siblings ...)
2021-04-18 22:15 ` ericonr
@ 2021-04-20 9:44 ` Gottox
2021-04-20 9:45 ` Gottox
2021-04-20 9:57 ` [PR PATCH] [Merged]: " Gottox
11 siblings, 0 replies; 13+ messages in thread
From: Gottox @ 2021-04-20 9:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages remove-vte290
https://github.com/void-linux/void-packages/pull/30052
Remove vte290
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30052.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-vte290-30052.patch --]
[-- Type: text/x-diff, Size: 7497 bytes --]
From d66ad1a8c31b1b550be5d2c9769cc0467bb77c26 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:11:23 +0200
Subject: [PATCH 1/5] 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 <orphan@voidlinux.org>"
From 623d56abb5a50130883c68bbf170cf3ff8df1361 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:19:05 +0200
Subject: [PATCH 2/5] nemiver: replace vte290 with vte3.
---
srcpkgs/nemiver/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template
index 8c6f02c6b0c6..6b0f491734c0 100644
--- a/srcpkgs/nemiver/template
+++ b/srcpkgs/nemiver/template
@@ -1,14 +1,14 @@
# Template build file for 'nemiver'.
pkgname=nemiver
version=0.9.6
-revision=4
+revision=5
lib32disabled=yes
build_style=gnu-configure
configure_args="--disable-static --enable-gsettings=yes
--disable-schemas-install --disable-schemas-compile"
depends="gdb gsettings-desktop-schemas"
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"
short_desc="Graphical front-end for gdb"
@@ -18,6 +18,10 @@ license="GPL-2"
distfiles="https://download.gnome.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2
+pre_configure() {
+ cp data/nemiver.appdata.xml data/nemiver.appdata.xml.in
+}
+
post_install() {
rm -rf ${DESTDIR}/usr/include
}
From 0c72cc0e76816ff33bd281fdf2a235a358ca81b0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:27:56 +0200
Subject: [PATCH 3/5] 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 <chocimier@tlen.pl>"
@@ -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 c8938cb4e6e46e4d596c32d88b9e5ad6f31152d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:29:44 +0200
Subject: [PATCH 4/5] 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 <orphan@voidlinux.org>"
-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]*"
From 5be61e6da512aacb5c9556dc31f3e7d5618d04a4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:40:06 +0200
Subject: [PATCH 5/5] nemiver: fix xlint
---
srcpkgs/nemiver/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template
index 6b0f491734c0..947ef8352a17 100644
--- a/srcpkgs/nemiver/template
+++ b/srcpkgs/nemiver/template
@@ -1,22 +1,22 @@
-# Template build file for 'nemiver'.
+# Template file for 'nemiver'
pkgname=nemiver
version=0.9.6
revision=5
-lib32disabled=yes
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 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 <gottox@voidlinux.org>"
+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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (9 preceding siblings ...)
2021-04-20 9:44 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-20 9:45 ` Gottox
2021-04-20 9:57 ` [PR PATCH] [Merged]: " Gottox
11 siblings, 0 replies; 13+ messages in thread
From: Gottox @ 2021-04-20 9:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages remove-vte290
https://github.com/void-linux/void-packages/pull/30052
Remove vte290
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30052.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-vte290-30052.patch --]
[-- Type: text/x-diff, Size: 6237 bytes --]
From d66ad1a8c31b1b550be5d2c9769cc0467bb77c26 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
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 <orphan@voidlinux.org>"
From 78348ba072506d44e33eb015ab768ad356c5caa1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
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 <gottox@voidlinux.org>"
+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 <gottox@voidlinux.org>
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 <chocimier@tlen.pl>"
@@ -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 <gottox@voidlinux.org>
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 <orphan@voidlinux.org>"
-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]*"
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Merged]: Remove vte290
2021-04-06 18:33 [PR PATCH] Remove vte290 Gottox
` (10 preceding siblings ...)
2021-04-20 9:45 ` Gottox
@ 2021-04-20 9:57 ` Gottox
11 siblings, 0 replies; 13+ messages in thread
From: Gottox @ 2021-04-20 9:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1398 bytes --]
There's a merged pull request on the void-packages repository
Remove vte290
https://github.com/void-linux/void-packages/pull/30052
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 13+ messages in thread