[arch-commits] Commit in thrift/trunk (PKGBUILD fix_cglib_compile_options.patch)
Date: Monday, October 12, 2015 @ 18:07:31
Author: anatolik
Revision: 143785
upgpkg: thrift 0.9.3-1
Modified:
thrift/trunk/PKGBUILD
Deleted:
thrift/trunk/fix_cglib_compile_options.patch
-+
PKGBUILD| 23 --
fix_cglib_compile_options.patch | 39 --
2 files changed, 9 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-10-12 15:38:11 UTC (rev 143784)
+++ PKGBUILD2015-10-12 16:07:31 UTC (rev 143785)
@@ -8,27 +8,21 @@
# the binding from the language specific managers python2-thrift, perl-thrift,
ruby-thrift, ...
pkgname=thrift
-pkgver=0.9.2
-pkgrel=3
+pkgver=0.9.3
+pkgrel=1
pkgdesc='Scalable cross-language services framework for IPC/RPC'
arch=(i686 x86_64)
url='http://thrift.apache.org/'
license=(APACHE)
depends=(gcc-libs openssl)
-makedepends=(qt4 boost libevent emacs-nox)
+makedepends=(qt4 qt5-base boost libevent emacs-nox)
optdepends=(
- 'qt4: TQTcpServer support'
+ 'qt4: TQTcpServer (Qt4) support'
+ 'qt5-base: TQTcpServer (Qt5) support'
)
-source=(thrift-$pkgver.zip::https://github.com/apache/thrift/archive/$pkgver.zip
-fix_cglib_compile_options.patch)
-sha1sums=('35e53e6705aee4c2286406e4fc6b0d4404a15332'
- '96650c499ab45824be04070d868114205fb4538c')
+source=(thrift-$pkgver.zip::https://github.com/apache/thrift/archive/$pkgver.zip)
+sha1sums=('695f47647f776a939d3818f4bc0c8e1de84e735b')
-prepare() {
- cd thrift-$pkgver
- patch -p1 < ../fix_cglib_compile_options.patch
-}
-
build() {
cd thrift-$pkgver
@@ -36,7 +30,8 @@
./configure --prefix=/usr \
--with-cpp \
--with-c_glib \
- --with-qt4 \
+ --with-qt4 \
+ --with-qt5 \
--with-libevent \
--with-csharp \
--without-haskell \
Deleted: fix_cglib_compile_options.patch
===
--- fix_cglib_compile_options.patch 2015-10-12 15:38:11 UTC (rev 143784)
+++ fix_cglib_compile_options.patch 2015-10-12 16:07:31 UTC (rev 143785)
@@ -1,39 +0,0 @@
-commit 4bf97c196aba9e50289333c15336ad109fc87f2d
-Author: Anatol Pomozov
-Date: Mon Nov 24 11:12:52 2014 -0800
-
-Do not drop CFLAGS from c_glib compilation
-
-CFLAGS contains important flags. Dropping it introduces e.g. such issues:
-https://sourceware.org/bugzilla/show_bug.cgi?id=13979
-
-Signed-off-by: Anatol Pomozov
-
-This closes #284
-
-diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am
-index 88e2d73..4e0aa88 100755
a/lib/c_glib/Makefile.am
-+++ b/lib/c_glib/Makefile.am
-@@ -24,11 +24,7 @@ pkgconfigdir = $(libdir)/pkgconfig
- lib_LTLIBRARIES = libthrift_c_glib.la
- pkgconfig_DATA = thrift_c_glib.pc
-
--common_cflags = -g -Wall -W -Isrc -I src/thrift/c_glib $(GLIB_CFLAGS)
--common_ldflags = -g -Wall -W $(GLIB_LDFLAGS) @GCOV_LDFLAGS@
--
--# this removes optimizations and adds coverage flags
--CFLAGS = @GCOV_CFLAGS@
-+AM_CFLAGS = -Isrc -I src/thrift/c_glib
-
- # Define the source files for the module
-
-@@ -54,7 +50,7 @@ libthrift_c_glib_la_SOURCES = src/thrift/c_glib/thrift.c \
- src/thrift/c_glib/server/thrift_server.c \
- src/thrift/c_glib/server/thrift_simple_server.c
-
--libthrift_c_glib_la_CFLAGS = $(common_cflags)
-+libthrift_c_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
-
- include_thriftdir = $(includedir)/thrift/c_glib
- include_thrift_HEADERS = \
[arch-commits] Commit in thrift/trunk (PKGBUILD fix_cglib_compile_options.patch)
Date: Sunday, December 21, 2014 @ 14:09:26
Author: anatolik
Revision: 124300
upgpkg: thrift 0.9.2-2
Fix FS#43071
Added:
thrift/trunk/fix_cglib_compile_options.patch
Modified:
thrift/trunk/PKGBUILD
-+
PKGBUILD| 16 +++
fix_cglib_compile_options.patch | 39 ++
2 files changed, 51 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-21 13:02:45 UTC (rev 124299)
+++ PKGBUILD2014-12-21 13:09:26 UTC (rev 124300)
@@ -9,19 +9,26 @@
pkgname=thrift
pkgver=0.9.2
-pkgrel=1
+pkgrel=2
pkgdesc='Scalable cross-language services framework for IPC/RPC'
arch=(i686 x86_64)
url='http://thrift.apache.org/'
license=(APACHE)
-depends=(gcc-libs openssl)
+depends=(gcc-libs openssl boost)
makedepends=(qt4 boost libevent emacs-nox)
optdepends=(
'qt4: TQTcpServer support'
)
-source=(http://www.apache.org/dist/thrift/$pkgver/thrift-$pkgver.tar.gz)
-sha1sums=('02f78b158da795ea89a26ce41964fbe562cc4235')
+source=(http://www.apache.org/dist/thrift/$pkgver/thrift-$pkgver.tar.gz
+fix_cglib_compile_options.patch)
+sha1sums=('02f78b158da795ea89a26ce41964fbe562cc4235'
+ '96650c499ab45824be04070d868114205fb4538c')
+prepare() {
+ cd thrift-$pkgver
+ patch -p1 < ../fix_cglib_compile_options.patch
+}
+
build() {
cd thrift-$pkgver
@@ -30,6 +37,7 @@
--with-c_glib \
--with-qt4 \
--with-libevent \
+ --with-csharp \
--without-haskell \
--without-php \
--without-ruby \
Added: fix_cglib_compile_options.patch
===
--- fix_cglib_compile_options.patch (rev 0)
+++ fix_cglib_compile_options.patch 2014-12-21 13:09:26 UTC (rev 124300)
@@ -0,0 +1,39 @@
+commit 4bf97c196aba9e50289333c15336ad109fc87f2d
+Author: Anatol Pomozov
+Date: Mon Nov 24 11:12:52 2014 -0800
+
+Do not drop CFLAGS from c_glib compilation
+
+CFLAGS contains important flags. Dropping it introduces e.g. such issues:
+https://sourceware.org/bugzilla/show_bug.cgi?id=13979
+
+Signed-off-by: Anatol Pomozov
+
+This closes #284
+
+diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am
+index 88e2d73..4e0aa88 100755
+--- a/lib/c_glib/Makefile.am
b/lib/c_glib/Makefile.am
+@@ -24,11 +24,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ lib_LTLIBRARIES = libthrift_c_glib.la
+ pkgconfig_DATA = thrift_c_glib.pc
+
+-common_cflags = -g -Wall -W -Isrc -I src/thrift/c_glib $(GLIB_CFLAGS)
+-common_ldflags = -g -Wall -W $(GLIB_LDFLAGS) @GCOV_LDFLAGS@
+-
+-# this removes optimizations and adds coverage flags
+-CFLAGS = @GCOV_CFLAGS@
++AM_CFLAGS = -Isrc -I src/thrift/c_glib
+
+ # Define the source files for the module
+
+@@ -54,7 +50,7 @@ libthrift_c_glib_la_SOURCES = src/thrift/c_glib/thrift.c \
+ src/thrift/c_glib/server/thrift_server.c \
+ src/thrift/c_glib/server/thrift_simple_server.c
+
+-libthrift_c_glib_la_CFLAGS = $(common_cflags)
++libthrift_c_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
+
+ include_thriftdir = $(includedir)/thrift/c_glib
+ include_thrift_HEADERS = \
