From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gmime: remove package, gmime3: rename to gmime
Date: Mon, 09 May 2022 23:29:32 +0200 [thread overview]
Message-ID: <20220509212932.jbSXEA7xRPTcy6pLiJtGdAZUx6Vfk5KeS0POJItQsYY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35897@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 415 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages remove-gmime
https://github.com/void-linux/void-packages/pull/35897
gmime: remove package, gmime3: rename to gmime
#### Testing the changes
- I tested the changes in this PR: **NO** (TODO)
A patch file from https://github.com/void-linux/void-packages/pull/35897.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-gmime-35897.patch --]
[-- Type: text/x-diff, Size: 9790 bytes --]
From 127d3d87c1fd4082b4bfaf1c6cf0ddb6d77edd82 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:50:30 +0100
Subject: [PATCH] gmime: rename from gmime3
* drop gmime(2), it's not used by anything
* make gmime3{,-devel} a transitional subpackage
---
common/shlibs | 3 +-
srcpkgs/gmime/files/iconv-detect.h | 1 +
srcpkgs/gmime/files/musl-iconv-detect.h | 1 +
srcpkgs/gmime/template | 87 ++++++++++++++++--------
srcpkgs/gmime/update | 1 -
srcpkgs/gmime3 | 1 +
srcpkgs/gmime3-devel | 2 +-
srcpkgs/gmime3/files/iconv-detect.h | 6 --
srcpkgs/gmime3/files/musl-iconv-detect.h | 6 --
srcpkgs/gmime3/template | 68 ------------------
srcpkgs/gmime3/update | 1 -
11 files changed, 63 insertions(+), 114 deletions(-)
delete mode 100644 srcpkgs/gmime/update
create mode 120000 srcpkgs/gmime3
delete mode 100644 srcpkgs/gmime3/files/iconv-detect.h
delete mode 100644 srcpkgs/gmime3/files/musl-iconv-detect.h
delete mode 100644 srcpkgs/gmime3/template
delete mode 100644 srcpkgs/gmime3/update
diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..d75ecdda38dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -745,7 +745,6 @@ libpulsecore-15.0.so libpulseaudio-15.0_1
libprojectM.so.3 projectM-3.1.7_2
liborc-0.4.so.0 orc-0.4.11_1
liborc-test-0.4.so.0 orc-0.4.11_1
-libgmime-2.6.so.0 gmime-2.6.4_1
libtotem-plparser.so.18 totem-pl-parser-3.26.1_1
libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1
libgladeui-2.so.13 libgladeui3-3.38.0_1
@@ -3574,7 +3573,7 @@ libcloudproviders.so.0 libcloudproviders-0.2.5_2
libKF5KDEGames.so.7 libkdegames-18.08.3_1
libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
libidn2.so.0 libidn2-2.1.1_1
-libgmime-3.0.so.0 gmime3-3.2.3_1
+libgmime-3.0.so.0 gmime-3.2.3_1
libgetdns.so.10 getdns-1.5.1_7
libgetdns_ext_event.so.10 getdns-1.5.1_7
libgetdns_ext_ev.so.10 getdns-1.5.1_7
diff --git a/srcpkgs/gmime/files/iconv-detect.h b/srcpkgs/gmime/files/iconv-detect.h
index 714cb5aa9dd4..6d9dd05b59e2 100644
--- a/srcpkgs/gmime/files/iconv-detect.h
+++ b/srcpkgs/gmime/files/iconv-detect.h
@@ -2,4 +2,5 @@
#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_SHIFT_JIS "shift-jis"
#define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/gmime/files/musl-iconv-detect.h b/srcpkgs/gmime/files/musl-iconv-detect.h
index 9f431bf9ff00..569da106b943 100644
--- a/srcpkgs/gmime/files/musl-iconv-detect.h
+++ b/srcpkgs/gmime/files/musl-iconv-detect.h
@@ -2,4 +2,5 @@
#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_SHIFT_JIS "shift-jis"
#define ICONV_10646 "UCS-4BE"
diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index 697cbd0ab67a..57718cac3bf0 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -1,43 +1,57 @@
# Template file for 'gmime'
pkgname=gmime
-version=2.6.23
-revision=4
+version=3.2.7
+revision=2
+wrksrc="gmime-${version}"
build_style=gnu-configure
build_helper="gir"
-configure_args="--disable-static --disable-mono --enable-smime
- --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="automake pkg-config intltool libtool
- $(vopt_if gir gobject-introspection)"
-makedepends="glib-devel gpgme-devel"
+configure_args="--disable-static --enable-crypto $(vopt_enable vala)
+ $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config $(vopt_if vala vala)"
+makedepends="glib-devel gpgme-devel libidn2-devel
+ $(vopt_if vala vala)"
+checkdepends="gnupg2"
short_desc="GNOME Core mime parsing library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/jstedfast/gmime"
distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=7149686a71ca42a1390869b6074815106b061aaeaaa8f2ef8c12c191d9a79f6a
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
- configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes"
- configure_args+=" am_cv_proto_iconv_arg1="
-fi
-
-pre_build() {
- if [ -z "$CROSS_BUILD" ]; then
- :
- elif [ "$XBPS_TARGET_LIBC" = musl ]; then
+checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
+
+build_options="gir vala"
+build_options_default="gir vala"
+
+pre_configure() {
+ [ -z "$CROSS_BUILD" ] && return 0
+
+ configure_args+=" ac_cv_have_iconv_detect_h=yes"
+
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h
else
- cp ${FILESDIR}/iconv-detect.h ${wrksrc}
+ cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h
+ fi
+}
+
+do_check() {
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ make check VERBOSITY=-vv |
+ awk '
+ 1
+ # utf-8 to iso-2022-jp is stateless
+ /GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next }
+ # euc-kr has not been supported
+ /euc-kr to UTF-8/ { next }
+ $NF == "FAILED" { e = 1 }
+ END { exit e }
+ '
+ else
+ make check
fi
}
gmime-devel_package() {
- depends="libglib-devel zlib-devel gmime>=${version}_${revision}"
+ depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -45,7 +59,22 @@ gmime-devel_package() {
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-*"
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
fi
}
}
+
+gmime3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+gmime3-devel_package() {
+ depends="${sourcepkg}-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
diff --git a/srcpkgs/gmime/update b/srcpkgs/gmime/update
deleted file mode 100644
index 4ee52a63831a..000000000000
--- a/srcpkgs/gmime/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3*" # Packages in gmime3
diff --git a/srcpkgs/gmime3 b/srcpkgs/gmime3
new file mode 120000
index 000000000000..4173041bbe71
--- /dev/null
+++ b/srcpkgs/gmime3
@@ -0,0 +1 @@
+gmime
\ No newline at end of file
diff --git a/srcpkgs/gmime3-devel b/srcpkgs/gmime3-devel
index 8029aee6f9f9..4173041bbe71 120000
--- a/srcpkgs/gmime3-devel
+++ b/srcpkgs/gmime3-devel
@@ -1 +1 @@
-gmime3
\ No newline at end of file
+gmime
\ No newline at end of file
diff --git a/srcpkgs/gmime3/files/iconv-detect.h b/srcpkgs/gmime3/files/iconv-detect.h
deleted file mode 100644
index 6d9dd05b59e2..000000000000
--- a/srcpkgs/gmime3/files/iconv-detect.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_SHIFT_JIS "shift-jis"
-#define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/gmime3/files/musl-iconv-detect.h b/srcpkgs/gmime3/files/musl-iconv-detect.h
deleted file mode 100644
index 569da106b943..000000000000
--- a/srcpkgs/gmime3/files/musl-iconv-detect.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_SHIFT_JIS "shift-jis"
-#define ICONV_10646 "UCS-4BE"
diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template
deleted file mode 100644
index 43e04197d50d..000000000000
--- a/srcpkgs/gmime3/template
+++ /dev/null
@@ -1,68 +0,0 @@
-# Template file for 'gmime3'
-pkgname=gmime3
-version=3.2.7
-revision=1
-wrksrc="gmime-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --enable-crypto $(vopt_enable vala)
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config $(vopt_if vala vala)"
-makedepends="glib-devel gpgme-devel libidn2-devel
- $(vopt_if vala vala)"
-checkdepends="gnupg2"
-short_desc="GNOME Core mime parsing library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/jstedfast/gmime"
-distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
-
-build_options="gir vala"
-build_options_default="gir vala"
-
-pre_configure() {
- [ -z "$CROSS_BUILD" ] && return 0
-
- configure_args+=" ac_cv_have_iconv_detect_h=yes"
-
- if [ "$XBPS_TARGET_LIBC" = musl ]; then
- cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h
- else
- cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h
- fi
-}
-
-do_check() {
- if [ "$XBPS_TARGET_LIBC" = musl ]; then
- make check VERBOSITY=-vv |
- awk '
- 1
- # utf-8 to iso-2022-jp is stateless
- /GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next }
- # euc-kr has not been supported
- /euc-kr to UTF-8/ { next }
- $NF == "FAILED" { e = 1 }
- END { exit e }
- '
- else
- make check
- fi
-}
-
-gmime3-devel_package() {
- depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/share/gtk-doc
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- if [ "$build_option_vala" ]; then
- vmove usr/share/vala
- fi
- }
-}
diff --git a/srcpkgs/gmime3/update b/srcpkgs/gmime3/update
deleted file mode 100644
index 0b6f335b26fa..000000000000
--- a/srcpkgs/gmime3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gmime
next prev parent reply other threads:[~2022-05-09 21:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 0:04 [PR PATCH] " paper42
2022-03-01 9:33 ` [PR PATCH] [Updated] " paper42
2022-04-07 17:38 ` paper42
2022-05-09 21:29 ` paper42 [this message]
2022-05-09 21:40 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220509212932.jbSXEA7xRPTcy6pLiJtGdAZUx6Vfk5KeS0POJItQsYY@z \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).