merge 334160 335258 tags 335258 patch thanks Ah, I guess this bug is already reported; never mind then. Here's a patch instead. :)
Since this bug has already been open for a bit, I'm going to go ahead and an NMU based on this patch. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u gnome-ruby-0.34/debian/changelog gnome-ruby-0.34/debian/changelog
--- gnome-ruby-0.34/debian/changelog
+++ gnome-ruby-0.34/debian/changelog
@@ -1,3 +1,16 @@
+gnome-ruby (0.34-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix extconf.rb scripts to not look for libraries and symbols that
+ aren't actually going to be used, eliminating a build failure with
+ gdk-pixbuf and possibly other future build failures as well
+ (closes: #334160).
+ * By rebuilding, we've dropped the dependency on libpng10-0, so
+ libart-ruby1.6 and libgnome-ruby1.6 are installable again
+ (closes: #328357, #328358).
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sat, 22 Oct 2005 17:02:52 -0700
+
gnome-ruby (0.34-1) unstable; urgency=low
* NMU build for ruby1.6 only
only in patch2:
unchanged:
--- gnome-ruby-0.34.orig/gdkimlib/extconf.rb
+++ gnome-ruby-0.34/gdkimlib/extconf.rb
@@ -11,11 +11,5 @@
$CFLAGS += " -g -I#{rubygtk_dir}/src " + `#{imlib_config} --cflags-gdk`.chomp
$libs += " " + `#{imlib_config} --libs-gdk`.chomp
-have_library("X11", "XOpenDisplay") &&
-have_library("Xi", "XOpenDevice") &&
-have_library("Xext", "XextFindDisplay") &&
-have_library("Xmu", "XmuInternAtom") &&
-have_func("g_print") &&
-have_func("gdk_init") &&
have_func("gdk_imlib_init") &&
create_makefile('gdk_imlib')
only in patch2:
unchanged:
--- gnome-ruby-0.34.orig/gdkpixbuf/extconf.rb
+++ gnome-ruby-0.34/gdkpixbuf/extconf.rb
@@ -15,10 +15,6 @@
$CFLAGS += " -I#{rubygtk_dir}/src " + `#{glib_config} --cflags`.chomp + ' ' +
`#{gdk_pixbuf_config} --cflags`.chomp
$libs += " " + `#{glib_config} --libs`.chomp + ' ' + `#{gdk_pixbuf_config}
--libs`.chomp
-have_library("X11", "XOpenDisplay") &&
-have_library("Xi", "XOpenDevice") &&
-have_library("Xext", "XextFindDisplay") &&
-have_library("Xmu", "XmuInternAtom") &&
have_func("g_print") &&
have_func("gdk_init") &&
have_func("gdk_pixbuf_new") &&
only in patch2:
unchanged:
--- gnome-ruby-0.34.orig/gnome/extconf.rb
+++ gnome-ruby-0.34/gnome/extconf.rb
@@ -32,26 +32,6 @@
$mdir = "gnome/src"
Dir.chdir "src"
- lib_ary = [ ["X11", "XOpenDisplay"],
- ["Xext", "XShmQueryVersion"],
- ["Xi", "XOpenDevice"],
-# ["glib", "g_print"],
-# ["gdk", "gdk_init"],
-# ["gtk", "gtk_init"],
-# ["gnome", "gnome_init"],
- ]
-
- lib_ary.each do |ary|
-
- if not have_library(ary[0], ary[1])
- msg = format("cannot found %s in %s.", ary[1], ary[0])
- if ary[0] == "X11"
- msg += " (or maybe `gnome-config --lib' is incorrect...)"
- end
- raise Interrupt, msg
- end
- end
- have_func("XReadBitmapFileData")
have_func("rb_block_proc") # for ruby-1.8
obj_ext = ".#{$OBJEXT}"
only in patch2:
unchanged:
--- gnome-ruby-0.34.orig/gtk/extconf.rb
+++ gnome-ruby-0.34/gtk/extconf.rb
@@ -58,13 +58,7 @@
if /cygwin|mingw/ =~ PLATFORM
$CFLAGS += " -fnative-struct -DNATIVE_WIN32" unless gdkx
elsif /mswin32/ !~ PLATFORM
- lib_ary = [ ["X11", "XOpenDisplay"],
- ["Xext", "XShmQueryVersion"],
- ["Xi", "XOpenDevice"],
-# ["glib", "g_print"],
-# ["gdk", "gdk_init"],
-# ["gtk", "gtk_init"],
- ]
+ lib_ary = [ ["X11", "XFree"] ]
else
lib_ary = [ ["glib-1.3", "g_print"],
["gdk-1.3", "gdk_init"],
only in patch2:
unchanged:
--- gnome-ruby-0.34.orig/libglade/extconf.rb
+++ gnome-ruby-0.34/libglade/extconf.rb
@@ -1,7 +1,7 @@
require "mkmf"
$objs = ["rbglade.o"]
-my_libs = ["glade", "xml", "z"]
+my_libs = ["glade"]
$use_gnome = ! arg_config("--disable-gnome", false)
only in patch2:
unchanged:
--- gnome-ruby-0.34.orig/panel-applet/extconf.rb
+++ gnome-ruby-0.34/panel-applet/extconf.rb
@@ -1,13 +1,7 @@
require 'mkmf'
-libs = [["X11", "XOpenDisplay"], ["Xi", "XOpenDevice"],
- ["Xext", "XextFindDisplay"], ["Xmu", "XmuInternAtom"]]
funcs = ["g_print", "gtk_init", "applet_widget_init"]
-libs.each do |lib|
- dir_config(lib[0])
-end
-
config_cmd = with_config('gnome-config', 'gnome-config')
rbgtk_dir = with_config("ruby-gtk", File.dirname(__FILE__)+"/../gtk")
@@ -23,15 +17,6 @@
$CFLAGS += " -I#{rbgtk_dir}/src -I#{rbgnome_dir}/src " + `#{config_cmd}
--cflags applets`.chomp
$libs += " " + `#{config_cmd} --libs applets`.chomp
-libs.each do |lib|
- unless have_library(*lib)
- puts "\n***"
- puts "Could not find lib#{lib[0]}."
- puts "You can specify its path using --with-#{lib[0]}-lib=/path/"
- exit
- end
-end
-
funcs.each do |func|
unless have_func(func)
puts "\n***"
signature.asc
Description: Digital signature
