[arch-commits] Commit in pan/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Friday, December 17, 2021 @ 20:53:49
  Author: arojas
Revision: 1076559

archrelease: copy trunk to community-x86_64

Added:
  pan/repos/community-x86_64/PKGBUILD
    (from rev 1076558, pan/trunk/PKGBUILD)
  pan/repos/community-x86_64/pan-enchant-2.patch
    (from rev 1076558, pan/trunk/pan-enchant-2.patch)
Deleted:
  pan/repos/community-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   66 +++++++++++++++++++++++++-------------------------
 pan-enchant-2.patch |   56 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 33 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-17 20:53:38 UTC (rev 1076558)
+++ PKGBUILD	2021-12-17 20:53:49 UTC (rev 1076559)
@@ -1,33 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Bernard Baeyens (berbae) <berbae52 at sfr dot fr>
-
-pkgname=pan
-pkgver=0.147
-pkgrel=1
-pkgdesc='A powerful Newsgroup Article reader'
-arch=(x86_64)
-url='http://pan.rebelbase.com/'
-license=(GPL2)
-depends=(gtkspell3 gmime)
-makedepends=(intltool itstool)
-source=(https://gitlab.gnome.org/GNOME/pan/-/archive/PAN_${pkgver/./_}/pan-PAN_${pkgver/./_}.tar.gz)
-sha256sums=('30f60d6eae4b578a4ec1530ed265f0d2aefd256e618ce1714e21f642340085e0')
-
-prepare() {
-  cd pan-PAN_${pkgver/./_}
-  sed -e 's/enchant/enchant-2/g' -i configure.ac
-  sed -e 's|enchant/enchant.h|enchant-2/enchant.h|' -i pan/gui/group-prefs-dialog.cc
-  sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac
-  ./autogen.sh
-}
-
-build() {
-  cd pan-PAN_${pkgver/./_}
-  ./configure --prefix=/usr --with-gnutls --with-gtk3
-  make
-}
-
-package() {
-  cd pan-PAN_${pkgver/./_}
-  make DESTDIR="$pkgdir" install
-}

Copied: pan/repos/community-x86_64/PKGBUILD (from rev 1076558, pan/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-17 20:53:49 UTC (rev 1076559)
@@ -0,0 +1,33 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Bernard Baeyens (berbae) <berbae52 at sfr dot fr>
+
+pkgname=pan
+pkgver=0.148
+pkgrel=1
+pkgdesc='A powerful Newsgroup Article reader'
+arch=(x86_64)
+url='http://pan.rebelbase.com/'
+license=(GPL2)
+depends=(gtkspell3 gmime3)
+source=(https://pan.rebelbase.com/download/releases/$pkgver/source/pan-$pkgver.tar.gz
+        pan-enchant-2.patch)
+sha256sums=('95798df5b5428d1134b41b7e0554d67131842706cd042605f50c79189cb5a28c'
+            '1e4928c3cd555d0e4dc8b880e14e1409fe0647035addcc93359fb1800c4e7cfd')
+
+prepare() {
+  cd pan-$pkgver
+  sed -e '/gtk+-2.0/d' -i configure.ac
+  patch -p1 -i ../pan-enchant-2.patch # Fix build with enchant 2
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd pan-$pkgver
+  ./configure --prefix=/usr --with-gnutls --with-gtk3 --with-gtkspell
+  make
+}
+
+package() {
+  cd pan-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: pan/repos/community-x86_64/pan-enchant-2.patch (from rev 1076558, pan/trunk/pan-enchant-2.patch)
===================================================================
--- pan-enchant-2.patch	                        (rev 0)
+++ pan-enchant-2.patch	2021-12-17 20:53:49 UTC (rev 1076559)
@@ -0,0 +1,56 @@
+From 80cc2da52e839916f9290b53a0540a29cb6442bc Mon Sep 17 00:00:00 2001
+From: Petr Kovar <pknbe at volny.cz>
+Date: Mon, 6 Dec 2021 23:21:21 +0100
+Subject: [PATCH] Actually build with enchant-2 for GTK 3
+
+CI: Don't bother trying to build with gtkspell-2.0 if enchant is
+no longer ailable on Ubuntu.
+
+CI: Since GTK 3 is not default, don't run make distcheck for it.
+---
+ .gitlab-ci.yml                | 11 +++++------
+ configure.ac                  |  3 ++-
+ pan/gui/group-prefs-dialog.cc |  4 ++++
+ 3 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a719895..27e39ca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,7 @@ GTK3_REQUIRED=3.0.0
+ GTKSPELL_REQUIRED=2.0.7
+ GTKSPELL3_REQUIRED=2.0.16
+ ENCHANT_REQUIRED=1.6.0
++ENCHANT2_REQUIRED=2.2.3
+ GNUTLS_REQUIRED=3.0.0
+ LIBNOTIFY_REQUIRED=0.4.1
+ LIBGKR_REQUIRED=3.2.0
+@@ -159,7 +160,7 @@ if test "x$want_gtk3" = "xyes" ; then
+                     AC_DEFINE(HAVE_GTK,[1],[GTK+ 3 support])]
+                     )
+   if test "x$want_gtkspell" = "xyes" ; then
+-    PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-3.0 >= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED],
++    PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-3.0 >= $GTKSPELL3_REQUIRED enchant-2 >= $ENCHANT2_REQUIRED],
+                       [
+                       gtkspell_msg=yes
+                       AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for spellchecking])
+diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
+index 8bd07a8..5b9296a 100644
+--- a/pan/gui/group-prefs-dialog.cc
++++ b/pan/gui/group-prefs-dialog.cc
+@@ -22,8 +22,12 @@
+ #include <glib.h>
+ #include "gtk-compat.h"
+ #ifdef HAVE_GTKSPELL
++#if GTKSPELL_VERSION == 3
++#include <enchant-2/enchant.h>
++#else
+ #include <enchant/enchant.h>
+ #endif
++#endif
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
+ #include <pan/data/data.h>
+-- 
+GitLab
+