[arch-commits] Commit in libevent/trunk (6 files)

[Jan Steffens]

    Date: Wednesday, August 3, 2022 @ 20:01:07
  Author: heftig
Revision: 452030

2.1.12-2: cleanup, enable debug, add docs, add libprovides, add patch for Firefox

Added:
  libevent/trunk/EVENT__SIZEOF_TIME_T.patch
  libevent/trunk/keys/
  libevent/trunk/keys/pgp/
  libevent/trunk/keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc
  libevent/trunk/keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc
Modified:
  libevent/trunk/PKGBUILD

-------------------------------------------------------+
 EVENT__SIZEOF_TIME_T.patch                            |   37 ++++++++
 PKGBUILD                                              |   68 +++++++++++-----
 keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc |    1 
 keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc |    1 
 4 files changed, 88 insertions(+), 19 deletions(-)

Added: EVENT__SIZEOF_TIME_T.patch
===================================================================
--- EVENT__SIZEOF_TIME_T.patch	                        (rev 0)
+++ EVENT__SIZEOF_TIME_T.patch	2022-08-03 20:01:07 UTC (rev 452030)
@@ -0,0 +1,37 @@
+From f5ad737d73ed18b95ce63f1d8e933a89a26653e9 Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin <azat at libevent.org>
+Date: Sat, 9 Jul 2022 14:22:38 +0300
+Subject: [PATCH] Add -Wundef for cmake and fix EVENT__SIZEOF_TIME_T usage
+
+Note, autotools already supports it.
+---
+ CMakeLists.txt       | 1 +
+ event-config.h.cmake | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ee0df2f7..9237252c7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -295,6 +295,7 @@ if (${GNUC})
+ 
+     list(APPEND __FLAGS
+          -Wall -Wextra -Wno-unused-parameter -Wstrict-aliasing -Wstrict-prototypes
++         -Wundef
+ 
+          -fno-strict-aliasing # gcc 2.9.5+
+          -Wmissing-prototypes
+diff --git a/event-config.h.cmake b/event-config.h.cmake
+index 9fff34877..4a6267017 100644
+--- a/event-config.h.cmake
++++ b/event-config.h.cmake
+@@ -485,6 +485,9 @@
+ /* The size of 'void *', as computer by sizeof */
+ #define EVENT__SIZEOF_VOID_P @EVENT__SIZEOF_VOID_P@
+ 
++/* The size of 'time_t', as computer by sizeof */
++#define EVENT__SIZEOF_TIME_T @EVENT__SIZEOF_TIME_T@
++
+ /* Define to `__inline__' or `__inline' if that's what the C compiler
+    calls it, or to nothing if 'inline' is not supported under any name.  */
+ #ifndef __cplusplus

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-03 19:22:26 UTC (rev 452029)
+++ PKGBUILD	2022-08-03 20:01:07 UTC (rev 452030)
@@ -1,35 +1,65 @@
-# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tom Gundersen <teg at jklm.no>
 # Contributor: Judd <jvinet at zeroflux.org>
 
-pkgname=libevent
+pkgbase=libevent
+pkgname=(libevent libevent-docs)
 pkgver=2.1.12
-pkgrel=1
-pkgdesc="An event notification library"
-arch=('x86_64')
+pkgrel=2
+pkgdesc="Event notification library"
 url="https://libevent.org/"
-license=('BSD')
-depends=('openssl')
-makedepends=('cmake' 'python')
-optdepends=('python: to use event_rpcgen.py')
-source=(https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/$pkgname-$pkgver-stable.tar.gz{,.asc})
+arch=(x86_64)
+license=(BSD)
+depends=(openssl)
+makedepends=(cmake ninja python zlib doxygen)
+options=(debug)
+source=(
+  https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz{,.asc}
+  EVENT__SIZEOF_TIME_T.patch
+)
 sha256sums=('92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb'
-            'SKIP')
+            'SKIP'
+            '945fc885b15692721bc7ae52f5774ef4fab8cc0f6108baa8860ab368de8675cf')
 validpgpkeys=('B35BF85BF19489D04E28C33C21194EBB165733EA'
               '9E3AC83A27974B84D1B3401DB86086848EF8686D')
 
+prepare() {
+  cd libevent-$pkgver-stable
+
+  # Fix Firefox build
+  patch -Np1 -i ../EVENT__SIZEOF_TIME_T.patch
+}
+
 build() {
-  cd ${pkgname}-${pkgver}-stable
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DEVENT__LIBRARY_TYPE=SHARED -S . -B build
+  cmake -S libevent-$pkgver-stable -B build -G Ninja \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_INSTALL_RPATH=TRUE \
+    -DEVENT__LIBRARY_TYPE=SHARED \
+    -DEVENT__DISABLE_REGRESS=OFF \
+    -DEVENT__DOXYGEN=ON
   cmake --build build
 }
 
 check() {
-  cd ${pkgname}-${pkgver}-stable
-  cmake --build build --target test
+  cd build
+  ctest --output-on-failure --stop-on-failure -j$(nproc)
 }
 
-package() {
-  cd ${pkgname}-${pkgver}-stable
-  cmake --build build --target install -- DESTDIR="$pkgdir"
-  install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/libevent/LICENSE
+package_libevent() {
+  provides=(libevent{,_core,_extra,_openssl,_pthreads}-2.1.so)
+  optdepends=('python: event_rpcgen.py')
+
+  DESTDIR="$pkgdir" cmake --install build
+
+  mkdir -p doc/usr/share
+  mv {"$pkgdir",doc}/usr/share/doc
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libevent-$pkgver-stable/LICENSE
 }
+
+package_libevent-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+
+  mv doc/* "$pkgdir"
+}

Added: keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc
===================================================================
(Binary files differ)

Index: libevent/trunk/keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc
===================================================================
--- keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc	2022-08-03 19:22:26 UTC (rev 452029)
+++ keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc	2022-08-03 20:01:07 UTC (rev 452030)

Property changes on: libevent/trunk/keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Added: keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc
===================================================================
(Binary files differ)

Index: libevent/trunk/keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc
===================================================================
--- keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc	2022-08-03 19:22:26 UTC (rev 452029)
+++ keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc	2022-08-03 20:01:07 UTC (rev 452030)

Property changes on: libevent/trunk/keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property