From 01399b8c1e2e7ef8cd74c87ed8a4b68227d4f2b5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 1 Mar 2022 00:50:30 +0100 Subject: [PATCH 1/2] 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 836cacc49b89..17ebef0ceb28 100644 --- a/common/shlibs +++ b/common/shlibs @@ -744,7 +744,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 @@ -3569,7 +3568,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 " -license="GPL-2.0-or-later" -homepage="http://www.gnome.org/" +maintainer="Enno Boland " +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 " -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 From d62ab03f7cc740abb55334e8eb56c0deed82223a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 1 Mar 2022 00:54:14 +0100 Subject: [PATCH 2/2] treewide: rename gmime3 to gmime --- srcpkgs/astroid/template | 2 +- srcpkgs/balsa/template | 2 +- srcpkgs/geary/template | 2 +- srcpkgs/gnome-core/template | 2 +- srcpkgs/mu4e/template | 2 +- ...configure-drop-gmime-session-key-extraction-support-.patch | 2 +- srcpkgs/notmuch/template | 4 ++-- srcpkgs/pan/template | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index 1021eb482068..78308544be68 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -5,7 +5,7 @@ revision=3 build_style=cmake hostmakedepends="pkg-config scdoc protobuf gobject-introspection" makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel - gmime3-devel boost-devel protobuf-devel vte3-devel gobject-introspection + gmime-devel boost-devel protobuf-devel vte3-devel gobject-introspection libpeas-devel libsoup-devel" checkdepends="gnupg notmuch w3m cmark xvfb-run" short_desc="Graphical threads-with-tags style email client for Notmuch" diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template index af0f741d1860..1ae976d5c7b9 100644 --- a/srcpkgs/balsa/template +++ b/srcpkgs/balsa/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--without-gnome --with-libsecret --with-gpgme --with-sqlite --with-html-widget=webkit2 --with-spell-checker=gspell" hostmakedepends="automake gettext-devel intltool pkg-config" -makedepends="gspell-devel gmime3-devel gnutls-devel gpgme-devel iso-codes +makedepends="gspell-devel gmime-devel gnutls-devel gpgme-devel iso-codes libesmtp-devel libnotify-devel libsecret-devel webkit2gtk-devel libical-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Email client for GNOME" diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index d8cfc84eb310..fcee98954457 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -7,7 +7,7 @@ build_style=meson configure_args="-Dprofile=release -Dcontractor=enabled" hostmakedepends="desktop-file-utils iso-codes pkg-config itstool gobject-introspection vala glib-devel gettext" -makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel +makedepends="enchant2-devel gcr-devel gmime-devel libsoup-devel libglib-devel libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index bdd854c47ac9..19a2eb06bc73 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -24,7 +24,7 @@ depends=" gjs>=1.70.0 glib>=2.70.0 glib-networking>=2.70.0 - gmime3>=3.2.7 + gmime>=3.2.7 gnome-backgrounds>=41.0 gnome-bluetooth>=3.34.5 gnome-color-manager>=3.36.0 diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template index 3d804715d9db..ca945eb59256 100644 --- a/srcpkgs/mu4e/template +++ b/srcpkgs/mu4e/template @@ -6,7 +6,7 @@ wrksrc="mu-${version}" build_style=gnu-configure configure_args="--enable-mu4e $(vopt_if guile --enable-guile)" hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel" -makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)" +makedepends="xapian-core-devel gmime-devel libuuid-devel $(vopt_if guile guile)" short_desc="Maildir-utils indexer/searcher and associated Emacs client" maintainer="Benjamin Slade " license="GPL-3.0-or-later" diff --git a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch index b6445729af6f..89b81164b6ff 100644 --- a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch +++ b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch @@ -7,7 +7,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Void Linux gmime3 always support session key extraction. +Void Linux gmime always support session key extraction. No suitable for upstream. diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template index b33a09fbddcf..6a452f14b8b9 100644 --- a/srcpkgs/notmuch/template +++ b/srcpkgs/notmuch/template @@ -8,9 +8,9 @@ configure_args="--prefix=/usr --emacsetcdir=/usr/share/emacs/site-lisp/notmuch" hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo desktop-file-utils emacs gnupg python3-setuptools" -makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel +makedepends="bash-completion gmime-devel talloc-devel xapian-core-devel python3-cffi" -depends="gmime3>=3.2.7" +depends="gmime>=3.2.7" checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core openssl" short_desc="Thread-based email index, search, and tagging" diff --git a/srcpkgs/pan/template b/srcpkgs/pan/template index 357b45f364b4..f0d80c9995bb 100644 --- a/srcpkgs/pan/template +++ b/srcpkgs/pan/template @@ -6,7 +6,7 @@ wrksrc="pan-v${version}" build_style=gnu-configure configure_args="--with-gnutls --with-gtk3 --enable-libnotify --enable-gkr" hostmakedepends="gettext pkg-config yelp-tools autoconf gettext-devel-tools automake libtool" -makedepends="gmime3-devel gnutls-devel gtk+3-devel libsecret-devel gtkspell3-devel libnotify-devel +makedepends="gmime-devel gnutls-devel gtk+3-devel libsecret-devel gtkspell3-devel libnotify-devel glib-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Usenet newsreader that's good at both text and binaries"