gpgme-ffi 3.0.2 → 3.0.3

data/ext/gpgme/Makefile.in

@@ -1,33 +1,46 @@
-BUILD   := <%= BUILD %>
-SRC     := <%= SRC %>
-PREFIX  := <%= PREFIX %>
+BUILD       := <%= BUILD %>
+SRC         := <%= SRC %>
+PREFIX      := <%= PREFIX %>
+ARCH_CFLAGS := <%= ARCH_CFLAGS %>
 
-TARGETS  := ${SRC}/libgpgme_gem.so ${SRC}/../../lib/gpgme/ffi/enums.rb
+TARGETS   := ${SRC}/libgpgme_gem.so ${SRC}/../../lib/gpgme/ffi/enums.rb
 
 GPG_ERROR := libgpg-error-1.10
 ASSUAN    := libassuan-2.0.2
 GPGME     := gpgme-1.3.1
 
-COMMON_FLAGS    := --prefix=${PREFIX} --disable-shared --enable-static --with-pic
+COMMON_FLAGS    := --prefix=${PREFIX} --disable-shared --enable-static --with-pic CFLAGS="${ARCH_CFLAGS}" --disable-dependency-tracking
 GPG_ERROR_FLAGS := --disable-nls
 ASSUAN_FLAGS    := --with-gpg-error-prefix=${PREFIX}
-GPGME_FLAGS     := --with-gpg-error-prefix=${PREFIX} --with-libassuan-prefix=${PREFIX}
+GPGME_FLAGS     := --with-gpg-error-prefix=${PREFIX} --with-libassuan-prefix=${PREFIX} --without-pth
 
 all: ${BUILD}/libgpgme_gem.so ${BUILD}/enums.rb
 
 clean:
 	rm -f ${BUILD}/libgpgme_gem.so ${BUILD}/enums.rb
 
+<% if TARGET_IS_FAT %>
+${BUILD}/libgpgme_gem.so: ${BUILD}/libgpgme_gem_i386.dylib ${BUILD}/libgpgme_gem_x86_64.dylib
+	lipo -create -output $@ $^
+
+%_i386.a: %.a
+	lipo -thin i386 -output $@ $<
+
+%_x86_64.a: %.a
+	lipo -thin x86_64 -output $@ $<
+
+${BUILD}/libgpgme_gem_%.dylib: ${BUILD}/libgpgme_ext_%.a ${BUILD}/libgpg-error_ext_%.a ${BUILD}/libassuan_ext_%.a
+<% else %>
 ${BUILD}/libgpgme_gem.so: ${BUILD}/libgpgme_ext.a ${BUILD}/libgpg-error_ext.a ${BUILD}/libassuan_ext.a
+<% end %>
 	for file in $^; do \
-		bn=`basename $$file _ext.a` && \
+		bn=`basename $$file .a` && \
 		rm -rf ${BUILD}/link-$$bn && \
 		mkdir ${BUILD}/link-$$bn && \
 		cd ${BUILD}/link-$$bn && \
 		ar x $$file; \
 	done
-	gcc -shared -o $@ $(foreach ext,libgpg-error libgpgme libassuan,${BUILD}/link-$(ext)/*.o) -lc
-	rm -rf $(addprefix ${BUILD}/link-,libgpg-error libgpgme libassuan)
+	gcc -shared -o $@ $(foreach dir,$^,${BUILD}/link-$(notdir $(dir:.a=))/*.o) <% if TARGET_IS_FAT %>-arch $*<% end %>
 
 ${BUILD}/%_ext.a: ${PREFIX}/lib/%.a
 	cp $< $@

data/ext/gpgme/extconf.rb

@@ -12,5 +12,13 @@ end
 
 system "gpg-agent", "--version"
 
+if %x{uname} == "Darwin\n"
+  ARCH_CFLAGS="-arch i386 -arch x86_64"
+  TARGET_IS_FAT=true
+else
+  ARCH_CFLAGS=""
+  TARGET_IS_FAT=false
+end
+
 template = ERB.new File.read("#{SRC}/Makefile.in")
 File.write "#{BUILD}/Makefile", template.result(binding)

data/lib/gpgme/ffi/functions.rb

@@ -150,14 +150,14 @@ module GPGME
         0
       else
 
-        buffer.write_bytes data, 0, data.length
+        buffer.put_bytes 0, data, 0, data.length
 
         data.length
       end
     end
 
     cbs[:write] = FFI::Function.new(:ssize_t, [ :pointer, :pointer, :size_t ]) do |handle, buffer, size|
-      data = buffer.read_bytes size
+      data = buffer.get_bytes 0, size
 
       ruby_cbs.write ruby_handle, data, size
     end
@@ -187,13 +187,13 @@ module GPGME
 
     return nil if bytes == 0
 
-    buf.read_bytes bytes
+    buf.get_bytes 0, bytes
   end
 
   def self.gpgme_data_write(data, buffer, length)
     buf = FFI::Buffer.new(:uint8, (length > 0) ? length : 1)
     if length > 0
-      buf.write_bytes buffer, 0, length
+      buf.put_bytes 0, buffer, 0, length
     end
 
     bytes = Library.gpgme_data_write data.context_pointer, buf, length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpgme-ffi
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3350640821445930124
+      hash: -3445448153825285067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3350640821445930124
+      hash: -3445448153825285067
 requirements: []
 rubyforge_project: ruby-gpgme
 rubygems_version: 1.8.24