rsvg2 0.90.4 → 0.90.5

data/Rakefile

@@ -63,6 +63,18 @@ Rake::ExtensionTask.new(package_name, spec) do |ext|
       spec.files += win32_files
     end
   end
+
+  def ext.define_compile_tasks(for_platform=nil, ruby_ver=RUBY_VERSION)
+    super
+    platf = for_platform || platform
+    return unless /mingw|mswin/ =~ platf
+    lib_path = lib_dir
+    tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
+    lib_a = "#{tmp_path}/libruby-#{@name}.a"
+    task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, lib_a] do
+      cp lib_a, lib_path
+    end
+  end
 end
 
 namespace :win32 do
@@ -70,8 +82,7 @@ namespace :win32 do
   task :download do
     $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
     require 'gnome2-win32-binary-downloader'
-    packages = ["glib", "atk", "gdk-pixbuf", "pango", "gtk+",
-                "librsvg", "libcroco"]
+    packages = ["glib", "gdk-pixbuf", "pango", "librsvg", "libcroco", "libgsf"]
     dependencies = ["gettext-runtime", "zlib", "freetype", "expat",
                     "fontconfig", "cairo", "libpng"]
     GNOME2Win32BinaryDownloader.download(:packages => packages,

data/ext/rsvg2/extconf.rb

@@ -77,3 +77,11 @@ unless have_header("librsvg/#{enum_type_prefix}.h")
   glib_mkenums(enum_type_prefix, headers, "RSVG_TYPE_", ["librsvg/rsvg.h"])
 end
 create_makefile(module_name)
+
+pkg_config_dir = with_config("pkg-config-dir")
+if pkg_config_dir.is_a?(String)
+  File.open("Makefile", "ab") do |makefile|
+    makefile.puts
+    makefile.puts("pkgconfigdir=#{pkg_config_dir}")
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsvg2
 version: !ruby/object:Gem::Version 
-  hash: 383
+  hash: 381
   prerelease: false
   segments: 
   - 0
   - 90
-  - 4
-  version: 0.90.4
+  - 5
+  version: 0.90.5
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +09:00
+date: 2010-10-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 383
+        hash: 381
         segments: 
         - 0
         - 90
-        - 4
-        version: 0.90.4
+        - 5
+        version: 0.90.5
   type: :runtime
   version_requirements: *id002
 description: Ruby/RSVG is a Ruby binding of librsvg-2.x.
@@ -64,11 +64,10 @@ files:
 - Rakefile
 - extconf.rb
 - lib/rsvg2.rb
-- ext/rsvg2/Makefile
 - ext/rsvg2/extconf.rb
-- ext/rsvg2/rsvg2.def
 - ext/rsvg2/depend
 - ext/rsvg2/rbrsvg.c
+- ext/rsvg2/rsvg2.def
 - sample/svg2.rb
 - sample/svg-viewer.rb
 has_rdoc: true

data/ext/rsvg2/Makefile

@@ -1,155 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = /home/kou/work/ruby/ruby-gnome2/rsvg/src
-topdir = /usr/lib/ruby/1.8/x86_64-linux
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
-exec_prefix = $(prefix)
-sitedir = $(DESTDIR)/usr/local/lib/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
-localedir = $(datarootdir)/locale
-htmldir = $(docdir)
-datadir = $(datarootdir)
-includedir = $(prefix)/include
-infodir = $(prefix)/share/info
-sysconfdir = $(DESTDIR)/etc
-mandir = $(prefix)/share/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(DESTDIR)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(prefix)/lib/ruby1.8
-
-CC = cc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC -fno-strict-aliasing -g -O2  -fPIC -Wall -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0   -DPNG_NO_MMX_CODE -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12   
-INCFLAGS = -I. -I/home/kou/work/ruby/ruby-gnome2/glib/src -I/home/kou/work/ruby/ruby-gnome2/glib/src -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/ruby-gnome2/rsvg
-CPPFLAGS = -DHAVE_RB_DEFINE_ALLOC_FUNC -DHAVE_RB_BLOCK_PROC -DHAVE_OBJECT_ALLOCATE -DHAVE_NODE_ATTRASGN -DHAVE_RSVG_SET_DEFAULT_DPI -DHAVE_RSVG_SET_DEFAULT_DPI_X_Y -DHAVE_RSVG_HANDLE_SET_DPI -DHAVE_RSVG_HANDLE_SET_DPI_X_Y -DHAVE_RSVG_HANDLE_GET_METADATA -DHAVE_RSVG_HANDLE_FREE -DHAVE_RSVG_HANDLE_GET_PIXBUF_SUB -DHAVE_TYPE_RSVGDIMENSIONDATA -DHAVE_RB_CAIRO_H -DHAVE_LIBRSVG_RSVG_CAIRO_H -DHAVE_LIBRSVG_LIBRSVG_ENUM_TYPES_H -DRUBY_RSVG2_COMPILATION  -I/usr/local/lib/site_ruby/1.8/x86_64-linux 
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.  -rdynamic -Wl,-export-dynamic    
-LDSHARED = $(CC) -shared
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby1.8
-RUBY_SO_NAME = ruby1.8
-arch = x86_64-linux
-sitearch = x86_64-linux
-ruby_version = 1.8
-ruby = /usr/bin/ruby1.8
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L"." -L"$(libdir)"
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lrsvg-2 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0   -lcairo   -lpthread -ldl -lcrypt -lm   -lc
-SRCS = rbrsvg.c
-OBJS = rbrsvg.o
-TARGET = rsvg2
-DLLIB = $(TARGET).so
-EXTSTATIC = 
-STATIC_LIB = 
-
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-pre-install-rb-default: $(RUBYLIBDIR)
-install-rb-default: $(RUBYLIBDIR)/rsvg2.rb
-$(RUBYLIBDIR)/rsvg2.rb: /home/kou/work/ruby/ruby-gnome2/rsvg/src/lib/rsvg2.rb
-	$(INSTALL_DATA) /home/kou/work/ruby/ruby-gnome2/rsvg/src/lib/rsvg2.rb $(@D)
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-$(RUBYLIBDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h