* [PR PATCH] gnome-common: remove
@ 2023-03-13 13:46 sgn
2023-03-16 5:02 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2023-03-13 13:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages gnome-common-remove
https://github.com/void-linux/void-packages/pull/42743
gnome-common: remove
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42743.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-common-remove-42743.patch --]
[-- Type: text/x-diff, Size: 13677 bytes --]
From fa14f365d6d136ad46e685e9ca114c21cb8eba13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:40:36 +0700
Subject: [PATCH 1/7] dropbox: update to 2023.02.27+cf4ccaa, move to nonfree
---
srcpkgs/dropbox/template | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
index aebb8a34a72f..150cb3c5dfd2 100644
--- a/srcpkgs/dropbox/template
+++ b/srcpkgs/dropbox/template
@@ -1,26 +1,32 @@
# Template file for 'dropbox'
pkgname=dropbox
-version=2022.12.05
+version=2023.02.27+cf4ccaa
revision=1
-_commit=8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3
build_style=gnu-configure
-hostmakedepends="pkg-config gnome-common libtool python3-gobject python3-docutils gdk-pixbuf-devel"
+configure_args="--disable-static"
+hostmakedepends="pkg-config automake libtool python3-gobject python3-docutils
+ gdk-pixbuf-devel"
makedepends="nautilus-devel python3-devel python3-gobject-devel"
depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
short_desc="Dropbox file sharing"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-or-later, CC-BY-ND-3.0"
homepage="https://www.dropbox.com"
-distfiles="https://github.com/dropbox/nautilus-dropbox/archive/8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3.tar.gz"
-checksum=e6018254963314b63e81b2ab6f936b48e439ba256ad93b5d447fb8e75c20c2ab
+distfiles="https://github.com/dropbox/nautilus-dropbox/archive/${version#*+}.tar.gz"
+checksum=821dd34fe8bbd89bacaa4b01a653f2c8764e5819c91efaffb0f7c14aa62f87fe
+# - The ND part of CC-BY-ND-3.0 is nonfree
+# - The package is just a wrapper to download and start proprietary dropbox
+# binary programs from dropbox.com, which are necessary for its function.
+repository=nonfree
-do_configure() {
- ./autogen.sh ${configure_args} --disable-static
+pre_configure() {
+ autoreconf -fi
}
nautilus-dropbox_package() {
short_desc="Dropbox nautilus plugin"
- depends="dropbox>=${version}_${revision}"
+ depends="dropbox>=${version}_${revision} nautilus"
+ repository=nonfree
pkg_install() {
vmove /usr/lib/nautilus
vmove /usr/share/nautilus-dropbox
From 6077eace47e4714fb581ee841f27d37e26596053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:40:37 +0700
Subject: [PATCH 2/7] bamf: update to 0.5.6.
---
srcpkgs/bamf/template | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/bamf/template b/srcpkgs/bamf/template
index f38d1dd18271..433ffc2abceb 100644
--- a/srcpkgs/bamf/template
+++ b/srcpkgs/bamf/template
@@ -1,47 +1,46 @@
# Template file for 'bamf'
pkgname=bamf
-version=0.5.5
+version=0.5.6
revision=1
build_style=gnu-configure
build_helper="gir"
configure_args="$(vopt_with gtk_doc gtk-doc)"
hostmakedepends="glib-devel gtk-doc pkg-config automake libtool
- $(vopt_if vala vala) gnome-common which"
+ $(vopt_if gir vala)"
makedepends="libglib-devel libgtop-devel libwnck-devel gtk+3-devel"
short_desc="Application matching framework"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-only, LGPL-2.1-only, GPL-3.0-or-later"
homepage="https://launchpad.net/bamf"
-distfiles="https://launchpad.net/bamf/${version%.*}/${version}/+download/bamf-${version}.tar.xz"
-checksum=10e642adf5169d46e32b113346bebdad437cddd1ddbd45d16c640cf60cabf5da
+distfiles="https://launchpad.net/bamf/${version%.*}/${version}/+download/bamf-${version}.tar.gz"
+checksum=4fcd00f23c542f3b79f35e10e322b67eacb399cac83f48db261cd8e8ea709478
CFLAGS="-Wno-cpp -Wno-deprecated-declarations"
-build_options="gir vala"
-build_options_default="gir vala"
+build_options="gir gtk_doc"
+build_options_default="gir"
if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
+ sed -i /GNOME_COMMON_INIT/d configure.ac
+ autoreconf -fi
}
bamf-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
if [ "$build_option_gtk_doc" ]; then
vmove usr/share/gtk-doc
fi
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
- fi
- if [ "$build_option_vala" ]; then
vmove usr/share/vala
fi
}
From 3a3ebc541c51025006e69171584cc6f32409fda3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:40:37 +0700
Subject: [PATCH 3/7] libkeybinder3: remove gnome-common
---
srcpkgs/libkeybinder3/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libkeybinder3/template b/srcpkgs/libkeybinder3/template
index 414cee096cd8..974e4af8d0fb 100644
--- a/srcpkgs/libkeybinder3/template
+++ b/srcpkgs/libkeybinder3/template
@@ -5,7 +5,8 @@ revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="$(vopt_enable gir introspection)"
-hostmakedepends="gnome-common gtk-doc libtool pkg-config $(vopt_if gir gobject-introspection)"
+hostmakedepends="gtk-doc libtool pkg-config automake
+ $(vopt_if gir gobject-introspection)"
makedepends="gtk+3-devel"
short_desc="Library for registering global keyboard shortcuts (GTK+3)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,7 +19,9 @@ build_options="gir"
build_options_default="gir"
pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
+ touch ChangeLog
+ autoupdate
+ autoreconf -fi
}
post_install() {
From 7d759415bc264c9db90dc6eff4fc08591f4f311b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:40:37 +0700
Subject: [PATCH 4/7] ibus-libpinyin: drop gnome-common dependency
---
srcpkgs/ibus-libpinyin/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ibus-libpinyin/template b/srcpkgs/ibus-libpinyin/template
index 7bd0d73a2b38..b725c707cb82 100644
--- a/srcpkgs/ibus-libpinyin/template
+++ b/srcpkgs/ibus-libpinyin/template
@@ -4,7 +4,7 @@ version=1.15.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext intltool libtool pkg-config autoconf-archive
- automake gnome-common which"
+ automake"
makedepends="gettext-devel glib-devel ibus-devel sqlite-devel libpinyin-devel"
short_desc="Intelligent Pinyin engine using libpinyin for IBus"
maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
@@ -14,5 +14,6 @@ distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/refs/tags/${versi
checksum=94ece1a2c0f04a0762228a1a0179d5c6b3d26c150a0d61260123052722c95f17
pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
+ autoupdate
+ autoreconf -fi
}
From 6f7199959f537fc1149f77d2c92728d354393973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:40:37 +0700
Subject: [PATCH 5/7] gtkimageview: drop gnome-common dependency
---
srcpkgs/gtkimageview/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gtkimageview/template b/srcpkgs/gtkimageview/template
index 59a770522f30..e1145f3a052b 100644
--- a/srcpkgs/gtkimageview/template
+++ b/srcpkgs/gtkimageview/template
@@ -4,8 +4,7 @@ version=1.6.4
revision=3
_githash=77abd2122c19d2eca21599404a2d3aece35081e2
build_style=gnu-configure
-configure_script="./autogen.sh"
-hostmakedepends="gnome-common pkg-config gtk-doc libtool glib-devel which"
+hostmakedepends="pkg-config gtk-doc libtool glib-devel automake"
makedepends="gtk+-devel"
short_desc="Widget that provides a zoomable and panable view of a GdkPixbuf"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,9 +13,10 @@ homepage="https://wiki.gnome.org/Projects/GTK/GtkImageView"
distfiles="https://repo-default.voidlinux.org/distfiles/gtkimageview-${_githash}.tar.gz"
checksum=2d61c9957500e515419b2b3b0d9a3d5efb67a6a8384743926121dcd618a9ef35
-pre_build() {
- vsed -e '/CFLAGS/s/-Werror //g' -i configure.in
- vsed '/DEPRECATED_FLAGS/d' -i configure.in
+pre_configure() {
+ vsed -e '/CFLAGS/s/-Werror//g;/DEPRECATED_FLAGS/d;/GNOME_/d;' -i configure.in
+ autoupdate
+ autoreconf -fi
}
gtkimageview-devel_package() {
From 3486502d4f0d6c75b17d67403025d6acbcb72e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 17:47:07 +0700
Subject: [PATCH 6/7] anjuta: drop gnome-common dependency
---
srcpkgs/anjuta/patches/no-gnome-common.patch | 21 +++++++++++++++++++
srcpkgs/anjuta/patches/vala-050.patch | 22 ++++++++++++++++++++
srcpkgs/anjuta/patches/vala.patch | 2 +-
srcpkgs/anjuta/template | 2 +-
4 files changed, 45 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/no-gnome-common.patch
create mode 100644 srcpkgs/anjuta/patches/vala-050.patch
diff --git a/srcpkgs/anjuta/patches/no-gnome-common.patch b/srcpkgs/anjuta/patches/no-gnome-common.patch
new file mode 100644
index 000000000000..c3812745e9f9
--- /dev/null
+++ b/srcpkgs/anjuta/patches/no-gnome-common.patch
@@ -0,0 +1,21 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -4,7 +4,7 @@
+
+ test -z "$srcdir" && srcdir=.
+
+-GNOMEDOC=`which yelp-build`
++GNOMEDOC=`command -v yelp-build`
+ if test -z $GNOMEDOC; then
+ echo "*** The tools to build the documentation are not found,"
+ echo " please intall the yelp-tool package ***"
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,7 +92,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])]
+ AC_MSG_ERROR([C++ Compiler required to compile Anjuta]))
+ AM_PROG_CC_C_O
+
+-GNOME_COMPILE_WARNINGS([yes])
+ AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
+ AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS"
+
diff --git a/srcpkgs/anjuta/patches/vala-050.patch b/srcpkgs/anjuta/patches/vala-050.patch
new file mode 100644
index 000000000000..540b38903c94
--- /dev/null
+++ b/srcpkgs/anjuta/patches/vala-050.patch
@@ -0,0 +1,22 @@
+commit 8f8fa97
+Author: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Fri Aug 20 08:26:49 2021 +0200
+
+ build: Allow building with vala 0.50
+
+diff --git a/plugins/language-support-vala/plugin.vala b/plugins/language-support-vala/plugin.vala
+index 718d74c..d94634c 100644
+--- a/plugins/language-support-vala/plugin.vala
++++ b/plugins/language-support-vala/plugin.vala
+@@ -78,7 +78,11 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
+
+ void init_context () {
+ context = new Vala.CodeContext();
++#if VALA_0_50
++ context.set_target_profile (Vala.Profile.GOBJECT);
++#else
+ context.profile = Vala.Profile.GOBJECT;
++#endif
+ context.report = report;
+ report.clear_error_indicators ();
+
diff --git a/srcpkgs/anjuta/patches/vala.patch b/srcpkgs/anjuta/patches/vala.patch
index 4b4477801cc2..8b66f37ecb80 100644
--- a/srcpkgs/anjuta/patches/vala.patch
+++ b/srcpkgs/anjuta/patches/vala.patch
@@ -5,7 +5,7 @@
AC_MSG_RESULT(no)
AC_MSG_CHECKING(if libvala is available)
- m4_foreach([VERSION], [[0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]],
-+ m4_foreach([VERSION], [[0.48], [0.46], [0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]],
++ m4_foreach([VERSION], [[0.56], [0.54], [0.52], [0.50], [0.48], [0.46], [0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]],
[PKG_CHECK_EXISTS([ libvala-VERSION ],
[ valaver="-VERSION" ])
])
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 3df046d884fb..cde101ee9197 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -9,7 +9,7 @@ configure_args="--disable-compile-warnings --disable-schemas-compile
SVN_INCLUDES=$XBPS_CROSS_BASE/usr/include SVN_LIBS=$XBPS_CROSS_BASE/usr/lib
$(vopt_enable gir introspection)"
hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
- libtool automake gettext-devel gnome-common yelp-tools which gtk-doc
+ libtool automake gettext-devel yelp-tools gtk-doc
vala-devel $(vopt_if gir gobject-introspection)"
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
From 08042e8aedd1323d26111fb1e07d3414290fcfa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:43:57 +0700
Subject: [PATCH 7/7] gnome-common: drop package
---
srcpkgs/gnome-common/template | 14 --------------
1 file changed, 14 deletions(-)
delete mode 100644 srcpkgs/gnome-common/template
diff --git a/srcpkgs/gnome-common/template b/srcpkgs/gnome-common/template
deleted file mode 100644
index 0e458e0662e5..000000000000
--- a/srcpkgs/gnome-common/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gnome-common'
-pkgname=gnome-common
-version=3.18.0
-revision=3
-build_style=gnu-configure
-configure_args="--with-autoconf-archive"
-hostmakedepends="automake"
-depends="automake"
-short_desc="Common scripts and macros to develop with GNOME"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="https://www.gnome.org"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: gnome-common: remove
2023-03-13 13:46 [PR PATCH] gnome-common: remove sgn
@ 2023-03-16 5:02 ` sgn
0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2023-03-16 5:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
There's a merged pull request on the void-packages repository
gnome-common: remove
https://github.com/void-linux/void-packages/pull/42743
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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] 2+ messages in thread
end of thread, other threads:[~2023-03-16 5:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-13 13:46 [PR PATCH] gnome-common: remove sgn
2023-03-16 5:02 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).