Date: Thursday, January 1, 2015 @ 14:38:14 Author: anatolik Revision: 228329
archrelease: copy trunk to testing-i686, testing-x86_64 Added: weechat/repos/testing-i686/PKGBUILD (from rev 228328, weechat/trunk/PKGBUILD) weechat/repos/testing-i686/fix_cmake31_shared_lib_compilation.patch (from rev 228328, weechat/trunk/fix_cmake31_shared_lib_compilation.patch) weechat/repos/testing-x86_64/PKGBUILD (from rev 228328, weechat/trunk/PKGBUILD) weechat/repos/testing-x86_64/fix_cmake31_shared_lib_compilation.patch (from rev 228328, weechat/trunk/fix_cmake31_shared_lib_compilation.patch) Deleted: weechat/repos/testing-i686/PKGBUILD weechat/repos/testing-x86_64/PKGBUILD ---------------------------------------------------------+ /PKGBUILD | 90 ++++++++++++++ testing-i686/PKGBUILD | 41 ------ testing-i686/fix_cmake31_shared_lib_compilation.patch | 22 +++ testing-x86_64/PKGBUILD | 41 ------ testing-x86_64/fix_cmake31_shared_lib_compilation.patch | 22 +++ 5 files changed, 134 insertions(+), 82 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2015-01-01 13:37:35 UTC (rev 228328) +++ testing-i686/PKGBUILD 2015-01-01 13:38:14 UTC (rev 228329) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: lucke <lucke at o2 dot pl> - -pkgname=weechat -pkgver=1.0.1 -pkgrel=2 -pkgdesc="Fast, light and extensible IRC client (curses UI)" -arch=('i686' 'x86_64') -url="http://www.weechat.org/" -license=('GPL') -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') - -prepare() { - mkdir build -} - -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 \ - -DENABLE_MAN=ON \ - -DENABLE_DOC=ON - - make -} - -package() { - cd build - - make DESTDIR="${pkgdir}/" install -} Copied: weechat/repos/testing-i686/PKGBUILD (from rev 228328, weechat/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-01-01 13:38:14 UTC (rev 228329) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: lucke <lucke at o2 dot pl> + +pkgname=weechat +pkgver=1.0.1 +pkgrel=3 +pkgdesc="Fast, light and extensible IRC client (curses UI)" +arch=('i686' 'x86_64') +url="http://www.weechat.org/" +license=('GPL') +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"{,.asc} + fix_cmake31_shared_lib_compilation.patch) +md5sums=('597b50e1340cfa7734f4ce72c3883705' + 'SKIP' + '3d0fb4bf0d622ee507bacf95878d614d') +validpgpkeys=('A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8') # WeeChat (signing key) <webmas...@weechat.org> + +prepare() { + mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 < ../fix_cmake31_shared_lib_compilation.patch +} + +build() { + cd build + + cmake -Wno-dev ../${pkgname}-${pkgver} -DPREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DENABLE_MAN=ON \ + -DENABLE_DOC=ON + + make +} + +package() { + cd build + + make DESTDIR="${pkgdir}/" install +} Copied: weechat/repos/testing-i686/fix_cmake31_shared_lib_compilation.patch (from rev 228328, weechat/trunk/fix_cmake31_shared_lib_compilation.patch) =================================================================== --- testing-i686/fix_cmake31_shared_lib_compilation.patch (rev 0) +++ testing-i686/fix_cmake31_shared_lib_compilation.patch 2015-01-01 13:38:14 UTC (rev 228329) @@ -0,0 +1,22 @@ +commit 00ba2e8c4d07f9b580723df7c5823f0e413dc5f2 +Author: Sébastien Helleu <flashc...@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) Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2015-01-01 13:37:35 UTC (rev 228328) +++ testing-x86_64/PKGBUILD 2015-01-01 13:38:14 UTC (rev 228329) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: lucke <lucke at o2 dot pl> - -pkgname=weechat -pkgver=1.0.1 -pkgrel=2 -pkgdesc="Fast, light and extensible IRC client (curses UI)" -arch=('i686' 'x86_64') -url="http://www.weechat.org/" -license=('GPL') -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') - -prepare() { - mkdir build -} - -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 \ - -DENABLE_MAN=ON \ - -DENABLE_DOC=ON - - make -} - -package() { - cd build - - make DESTDIR="${pkgdir}/" install -} Copied: weechat/repos/testing-x86_64/PKGBUILD (from rev 228328, weechat/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-01-01 13:38:14 UTC (rev 228329) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: lucke <lucke at o2 dot pl> + +pkgname=weechat +pkgver=1.0.1 +pkgrel=3 +pkgdesc="Fast, light and extensible IRC client (curses UI)" +arch=('i686' 'x86_64') +url="http://www.weechat.org/" +license=('GPL') +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"{,.asc} + fix_cmake31_shared_lib_compilation.patch) +md5sums=('597b50e1340cfa7734f4ce72c3883705' + 'SKIP' + '3d0fb4bf0d622ee507bacf95878d614d') +validpgpkeys=('A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8') # WeeChat (signing key) <webmas...@weechat.org> + +prepare() { + mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 < ../fix_cmake31_shared_lib_compilation.patch +} + +build() { + cd build + + cmake -Wno-dev ../${pkgname}-${pkgver} -DPREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DENABLE_MAN=ON \ + -DENABLE_DOC=ON + + make +} + +package() { + cd build + + make DESTDIR="${pkgdir}/" install +} Copied: weechat/repos/testing-x86_64/fix_cmake31_shared_lib_compilation.patch (from rev 228328, weechat/trunk/fix_cmake31_shared_lib_compilation.patch) =================================================================== --- testing-x86_64/fix_cmake31_shared_lib_compilation.patch (rev 0) +++ testing-x86_64/fix_cmake31_shared_lib_compilation.patch 2015-01-01 13:38:14 UTC (rev 228329) @@ -0,0 +1,22 @@ +commit 00ba2e8c4d07f9b580723df7c5823f0e413dc5f2 +Author: Sébastien Helleu <flashc...@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)