[arch-commits] Commit in pan/repos/community-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Thu Dec 23 17:57:09 UTC 2021
Date: Thursday, December 23, 2021 @ 17:57:09
Author: arojas
Revision: 1083317
archrelease: copy trunk to community-x86_64
Added:
pan/repos/community-x86_64/PKGBUILD
(from rev 1083316, pan/trunk/PKGBUILD)
pan/repos/community-x86_64/pan-enchant-2.patch
(from rev 1083316, pan/trunk/pan-enchant-2.patch)
Deleted:
pan/repos/community-x86_64/PKGBUILD
pan/repos/community-x86_64/pan-enchant-2.patch
---------------------+
PKGBUILD | 58 +++++++++++--------------
pan-enchant-2.patch | 112 +++++++++++++++++++++++++-------------------------
2 files changed, 81 insertions(+), 89 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-23 17:56:58 UTC (rev 1083316)
+++ PKGBUILD 2021-12-23 17:57:09 UTC (rev 1083317)
@@ -1,33 +0,0 @@
-# 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/PKGBUILD (from rev 1083316, pan/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-23 17:57:09 UTC (rev 1083317)
@@ -0,0 +1,25 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Bernard Baeyens (berbae) <berbae52 at sfr dot fr>
+
+pkgname=pan
+pkgver=0.149
+pkgrel=1
+pkgdesc='A powerful Newsgroup Article reader'
+arch=(x86_64)
+url='http://pan.rebelbase.com/'
+license=(GPL2)
+depends=(gtkspell3 gmime3)
+makedepends=(itstool)
+source=(https://pan.rebelbase.com/download/releases/$pkgver/source/pan-$pkgver.tar.gz)
+sha256sums=('2445252125bc56d022dda1236adf80ae85274b41e5002c5667b0e032725b32b7')
+
+build() {
+ cd pan-$pkgver
+ ./configure --prefix=/usr --with-gnutls --with-gtk3 --with-gtkspell
+ make
+}
+
+package() {
+ cd pan-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: pan-enchant-2.patch
===================================================================
--- pan-enchant-2.patch 2021-12-23 17:56:58 UTC (rev 1083316)
+++ pan-enchant-2.patch 2021-12-23 17:57:09 UTC (rev 1083317)
@@ -1,56 +0,0 @@
-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
-
Copied: pan/repos/community-x86_64/pan-enchant-2.patch (from rev 1083316, pan/trunk/pan-enchant-2.patch)
===================================================================
--- pan-enchant-2.patch (rev 0)
+++ pan-enchant-2.patch 2021-12-23 17:57:09 UTC (rev 1083317)
@@ -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
+
More information about the arch-commits
mailing list