From 1e98d18110a8c3d279ce58465fe72d448e8266d2 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 20 Jun 2025 08:41:29 +0200 Subject: core/gpgme-1: was in the wrong place, moved to "core" --- core/gpgme-1/0025_debian_default_is_openpgp.diff | 18 +++++ core/gpgme-1/PKGBUILD | 99 ++++++++++++++++++++++++ gpgme-1/0025_debian_default_is_openpgp.diff | 18 ----- gpgme-1/PKGBUILD | 99 ------------------------ 4 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 core/gpgme-1/0025_debian_default_is_openpgp.diff create mode 100644 core/gpgme-1/PKGBUILD delete mode 100644 gpgme-1/0025_debian_default_is_openpgp.diff delete mode 100644 gpgme-1/PKGBUILD diff --git a/core/gpgme-1/0025_debian_default_is_openpgp.diff b/core/gpgme-1/0025_debian_default_is_openpgp.diff new file mode 100644 index 00000000..31853359 --- /dev/null +++ b/core/gpgme-1/0025_debian_default_is_openpgp.diff @@ -0,0 +1,18 @@ +Description: Adapt testsuite to changed gnupg defaults in Debian +Author: Andreas Metzler +Origin: vendor +Bug-Debian: https://bugs.debian.org/1103189 +Forwarded: not-needed +Last-Update: 2025-04-20 + +--- gpgme1.0-1.24.2.orig/lang/qt/tests/t-config.cpp ++++ gpgme1.0-1.24.2/lang/qt/tests/t-config.cpp +@@ -62,7 +62,7 @@ private Q_SLOTS: + auto entry = conf->entry(QStringLiteral("gpg"), QStringLiteral("compliance")); + QVERIFY(entry); + const auto defaultValue = entry->defaultValue().toString(); +- QCOMPARE(defaultValue, QStringLiteral("gnupg")); ++ QCOMPARE(defaultValue, QStringLiteral("openpgp")); + + entry->setStringValue("de-vs"); + conf->sync(true); diff --git a/core/gpgme-1/PKGBUILD b/core/gpgme-1/PKGBUILD new file mode 100644 index 00000000..ea649fe7 --- /dev/null +++ b/core/gpgme-1/PKGBUILD @@ -0,0 +1,99 @@ +# Maintainer: Tobias Powalowski +# Contributor: Roman Kyrylych +# Contributor: Sarah Hay + +pkgname=gpgme-1 +_pkgname=gpgme +pkgver=1.24.3 +pkgrel=4 +pkgdesc='C wrapper library for GnuPG - 1.x' +arch=('x86_64' 'pentium4' 'i686' 'i486') +url='https://www.gnupg.org/related_software/gpgme/' +license=( + GPL-2.0-or-later + LGPL-2.0-or-later + LGPL-2.1-or-later + MIT +) +options+=('!emptydirs') +makedepends=( + 'git' + 'gnupg' + 'libassuan' + 'libgpg-error' +) +depends=( + 'gcc-libs' + 'glib2' + 'glibc' + 'libassuan' + 'libgpg-error' + 'gnupg>=2' +) +makedepends=('git') +provides=('libgpgme.so') +options=('!emptydirs') +validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020) + 'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key) +source=("git+https://dev.gnupg.org/source/gpgme.git#tag=${_pkgname}-${pkgver}?signed" + '0025_debian_default_is_openpgp.diff') +sha256sums=('630d7301a614bf22916cecdb78bbb34ea1dd724071a9ea9aee67aab06ba3dea1' + 'f8bdaba4732347067ce291ca2acd6096e7a02c162a760be3515e0c4cdac60d6f') + +prepare() { + cd ${_pkgname} + + # Adapt testsuite to changed gnupg defaults in Debian + patch -Np1 < ../0025_debian_default_is_openpgp.diff + + sed -i 's/-unknown//' autogen.sh + autoreconf -fi +} + +build() { + cd ${_pkgname} + + ./configure \ + --prefix=/usr \ + --disable-fd-passing \ + --disable-static \ + --disable-gpgsm-test \ + --disable-python \ + --enable-languages=cpp + + # prevent excessive overlinking due to libtool + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +check() { + cd ${_pkgname} + + # this test fails with gnupg (FS#66572) + sed -i 's#"t-keylist-secret",##' tests/json/t-json.c + + make check +} + +package() { + + cd ${_pkgname} + + make DESTDIR="${pkgdir}" install + + # remove everything but the header files and the libraries + # also remove all compilation helpers, as they fail anyway probably + rm -rf "$pkgdir/usr/bin" + rm -rf "$pkgdir/usr/lib/cmake" + rm -rf "$pkgdir/usr/lib/pkgconfig" + rm -rf "$pkgdir/usr/lib/"*.so + rm -rf "$pkgdir/usr/share" + + # move include files out of the way + mkdir "$pkgdir/usr/include/gpgme1" + mv -vn "$pkgdir/usr/include/gpgme.h" "$pkgdir/usr/include/gpgme1/." + mv -vn "$pkgdir/usr/include/gpgme++" "$pkgdir/usr/include/gpgme1/." + + # add a license + install -vDm 644 LICENSES "$pkgdir/usr/share/licenses/$pkgname/MIT.txt" +} diff --git a/gpgme-1/0025_debian_default_is_openpgp.diff b/gpgme-1/0025_debian_default_is_openpgp.diff deleted file mode 100644 index 31853359..00000000 --- a/gpgme-1/0025_debian_default_is_openpgp.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: Adapt testsuite to changed gnupg defaults in Debian -Author: Andreas Metzler -Origin: vendor -Bug-Debian: https://bugs.debian.org/1103189 -Forwarded: not-needed -Last-Update: 2025-04-20 - ---- gpgme1.0-1.24.2.orig/lang/qt/tests/t-config.cpp -+++ gpgme1.0-1.24.2/lang/qt/tests/t-config.cpp -@@ -62,7 +62,7 @@ private Q_SLOTS: - auto entry = conf->entry(QStringLiteral("gpg"), QStringLiteral("compliance")); - QVERIFY(entry); - const auto defaultValue = entry->defaultValue().toString(); -- QCOMPARE(defaultValue, QStringLiteral("gnupg")); -+ QCOMPARE(defaultValue, QStringLiteral("openpgp")); - - entry->setStringValue("de-vs"); - conf->sync(true); diff --git a/gpgme-1/PKGBUILD b/gpgme-1/PKGBUILD deleted file mode 100644 index ea649fe7..00000000 --- a/gpgme-1/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# Maintainer: Tobias Powalowski -# Contributor: Roman Kyrylych -# Contributor: Sarah Hay - -pkgname=gpgme-1 -_pkgname=gpgme -pkgver=1.24.3 -pkgrel=4 -pkgdesc='C wrapper library for GnuPG - 1.x' -arch=('x86_64' 'pentium4' 'i686' 'i486') -url='https://www.gnupg.org/related_software/gpgme/' -license=( - GPL-2.0-or-later - LGPL-2.0-or-later - LGPL-2.1-or-later - MIT -) -options+=('!emptydirs') -makedepends=( - 'git' - 'gnupg' - 'libassuan' - 'libgpg-error' -) -depends=( - 'gcc-libs' - 'glib2' - 'glibc' - 'libassuan' - 'libgpg-error' - 'gnupg>=2' -) -makedepends=('git') -provides=('libgpgme.so') -options=('!emptydirs') -validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020) - 'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key) -source=("git+https://dev.gnupg.org/source/gpgme.git#tag=${_pkgname}-${pkgver}?signed" - '0025_debian_default_is_openpgp.diff') -sha256sums=('630d7301a614bf22916cecdb78bbb34ea1dd724071a9ea9aee67aab06ba3dea1' - 'f8bdaba4732347067ce291ca2acd6096e7a02c162a760be3515e0c4cdac60d6f') - -prepare() { - cd ${_pkgname} - - # Adapt testsuite to changed gnupg defaults in Debian - patch -Np1 < ../0025_debian_default_is_openpgp.diff - - sed -i 's/-unknown//' autogen.sh - autoreconf -fi -} - -build() { - cd ${_pkgname} - - ./configure \ - --prefix=/usr \ - --disable-fd-passing \ - --disable-static \ - --disable-gpgsm-test \ - --disable-python \ - --enable-languages=cpp - - # prevent excessive overlinking due to libtool - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -check() { - cd ${_pkgname} - - # this test fails with gnupg (FS#66572) - sed -i 's#"t-keylist-secret",##' tests/json/t-json.c - - make check -} - -package() { - - cd ${_pkgname} - - make DESTDIR="${pkgdir}" install - - # remove everything but the header files and the libraries - # also remove all compilation helpers, as they fail anyway probably - rm -rf "$pkgdir/usr/bin" - rm -rf "$pkgdir/usr/lib/cmake" - rm -rf "$pkgdir/usr/lib/pkgconfig" - rm -rf "$pkgdir/usr/lib/"*.so - rm -rf "$pkgdir/usr/share" - - # move include files out of the way - mkdir "$pkgdir/usr/include/gpgme1" - mv -vn "$pkgdir/usr/include/gpgme.h" "$pkgdir/usr/include/gpgme1/." - mv -vn "$pkgdir/usr/include/gpgme++" "$pkgdir/usr/include/gpgme1/." - - # add a license - install -vDm 644 LICENSES "$pkgdir/usr/share/licenses/$pkgname/MIT.txt" -} -- cgit v1.2.3-70-g09d2