[arch-commits] Commit in weechat/trunk (2 files)

[Anatol Pomozov]

    Date: Thursday, January 1, 2015 @ 14:37:35
  Author: anatolik
Revision: 228328

upgpkg: weechat 1.0.1-3

ruby 2.2 rebuild:
  - pull proper cmake 3.1 from upstream
  - add validpgpkeys

Added:
  weechat/trunk/fix_cmake31_shared_lib_compilation.patch
Modified:
  weechat/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   16 ++++++++++------
 fix_cmake31_shared_lib_compilation.patch |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-01 12:51:08 UTC (rev 228327)
+++ PKGBUILD	2015-01-01 13:37:35 UTC (rev 228328)
@@ -4,7 +4,7 @@
 
 pkgname=weechat
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64')
 url="http://www.weechat.org/"
@@ -12,19 +12,23 @@
 depends=('gnutls' 'curl' 'libgcrypt')
 makedepends=('asciidoc' 'source-highlight' 'cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
-source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('597b50e1340cfa7734f4ce72c3883705')
+source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2"{,.asc}
+        fix_cmake31_shared_lib_compilation.patch)
+md5sums=('597b50e1340cfa7734f4ce72c3883705'
+         'SKIP'
+         '3d0fb4bf0d622ee507bacf95878d614d')
+validpgpkeys=('A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8') # WeeChat (signing key) <webmaster at weechat.org>
 
 prepare() {
   mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 < ../fix_cmake31_shared_lib_compilation.patch
 }
 
 build() {
   cd build
 
-  # workaround for https://github.com/weechat/weechat/issues/287
-  export CFLAGS="$CFLAGS -fPIC"
-
   cmake -Wno-dev ../${pkgname}-${pkgver} -DPREFIX=/usr \
         -DPYTHON_EXECUTABLE=/usr/bin/python2 \
         -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \

Added: fix_cmake31_shared_lib_compilation.patch
===================================================================
--- fix_cmake31_shared_lib_compilation.patch	                        (rev 0)
+++ fix_cmake31_shared_lib_compilation.patch	2015-01-01 13:37:35 UTC (rev 228328)
@@ -0,0 +1,22 @@
+commit 00ba2e8c4d07f9b580723df7c5823f0e413dc5f2
+Author: Sébastien Helleu <flashcode at flashtux.org>
+Date:   Thu Jan 1 13:23:57 2015 +0100
+
+    core: fix compilation of plugins with cmake >= 3.1 (closes #287)
+    
+    The flag -fPIC is now forced for compilation of plugins.
+    It should fix compilation problems when cmake doesn't add this flag.
+
+diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
+index 95c457b..58193e3 100644
+--- a/src/plugins/CMakeLists.txt
++++ b/src/plugins/CMakeLists.txt
+@@ -32,7 +32,7 @@ plugin-script-callback.c plugin-script-callback.h)
+ include_directories(${CMAKE_BINARY_DIR})
+ add_library(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
+ 
+-add_definitions(${CMAKE_SHARED_LIBRARY_C_FLAGS})
++add_definitions(${CMAKE_SHARED_LIBRARY_C_FLAGS} -fPIC)
+ add_library(weechat_plugins_scripts STATIC ${LIB_PLUGINS_SCRIPTS_SRC})
+ 
+ include(CheckIncludeFiles)