[DRE-commits] [ruby-gnome2] 22/31: Refresh patches

[Daisuke Higuchi]

This is an automated email from the git hooks/post-receive script.

dai pushed a commit to branch exp/debian
in repository ruby-gnome2.

commit b97c8a55ee3ba96d24d895a4da3ffa0674df7f7c
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Sun Oct 9 23:11:13 2016 +0900

    Refresh patches
---
 .../patches/Fail-the-build-if-any-subpackage-fails |  2 +-
 debian/patches/no-clutter-gst-2.0                  |  6 ++---
 debian/patches/no-vte.patch                        | 26 +++++++++++++---------
 debian/patches/reject_goocanvas.patch              |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/debian/patches/Fail-the-build-if-any-subpackage-fails b/debian/patches/Fail-the-build-if-any-subpackage-fails
index bd65bb8..06f92f8 100644
--- a/debian/patches/Fail-the-build-if-any-subpackage-fails
+++ b/debian/patches/Fail-the-build-if-any-subpackage-fails
@@ -16,7 +16,7 @@ Index: ruby-gnome2/extconf.rb
 ===================================================================
 --- ruby-gnome2.orig/extconf.rb
 +++ ruby-gnome2/extconf.rb
-@@ -92,6 +92,9 @@ subdirs.each do |subdir|
+@@ -96,6 +96,9 @@ subdirs.each do |subdir|
    if ret
      target_modules << subdir
    else
diff --git a/debian/patches/no-clutter-gst-2.0 b/debian/patches/no-clutter-gst-2.0
index ebecfeb..8d504f8 100644
--- a/debian/patches/no-clutter-gst-2.0
+++ b/debian/patches/no-clutter-gst-2.0
@@ -2,14 +2,14 @@ Index: ruby-gnome2/Rakefile
 ===================================================================
 --- ruby-gnome2.orig/Rakefile
 +++ ruby-gnome2/Rakefile
-@@ -156,7 +156,6 @@ gnome2_packages = gtk2_packages + gtk3_p
+@@ -117,7 +117,6 @@ gnome2_packages = gtk2_packages + gtk3_p
    "gtksourceview3",
    "clutter",
    "clutter-gtk",
 -  "clutter-gstreamer",
    "webkit-gtk",
    "webkit-gtk2",
- ]
+   "webkit2-gtk",
 Index: ruby-gnome2/extconf.rb
 ===================================================================
 --- ruby-gnome2.orig/extconf.rb
@@ -21,4 +21,4 @@ Index: ruby-gnome2/extconf.rb
 +  "clutter-gstreamer",
    "vte",
    "vte3",
-   "gdk3-no-gi"
+   "gdk_pixbuf2-no-gi",
diff --git a/debian/patches/no-vte.patch b/debian/patches/no-vte.patch
index 181d8d2..b0a1e0a 100644
--- a/debian/patches/no-vte.patch
+++ b/debian/patches/no-vte.patch
@@ -1,6 +1,8 @@
---- a/Rakefile
-+++ b/Rakefile
-@@ -153,8 +153,6 @@
+Index: ruby-gnome2/Rakefile
+===================================================================
+--- ruby-gnome2.orig/Rakefile
++++ ruby-gnome2/Rakefile
+@@ -114,8 +114,6 @@ gnome2_packages = gtk2_packages + gtk3_p
    "gtksourceview2",
    "poppler",
    "rsvg2",
@@ -9,7 +11,7 @@
    "gtksourceview3",
    "clutter",
    "clutter-gtk",
-@@ -370,8 +368,6 @@
+@@ -398,8 +396,6 @@ namespace :gem do
    namespace :windows do
      windows_unsupported_packages = [
        "gtksourceview2",
@@ -17,15 +19,17 @@
 -      "vte3",
        "webkit-gtk",
        "webkit-gtk2",
-     ]
---- a/extconf.rb
-+++ b/extconf.rb
-@@ -24,6 +24,8 @@
+       "webkit2-gtk",
+Index: ruby-gnome2/extconf.rb
+===================================================================
+--- ruby-gnome2.orig/extconf.rb
++++ ruby-gnome2/extconf.rb
+@@ -24,6 +24,8 @@ priorlibs = [
  ]
  
  unsupported_libraries = [
 +  "vte",
 +  "vte3",
-   "gdk3-no-gi"
- ]
- 
+   "gdk_pixbuf2-no-gi",
+   "gdk3-no-gi",
+   "gtk3-no-gi",
diff --git a/debian/patches/reject_goocanvas.patch b/debian/patches/reject_goocanvas.patch
index 9e86c0f..b5dfadd 100644
--- a/debian/patches/reject_goocanvas.patch
+++ b/debian/patches/reject_goocanvas.patch
@@ -7,7 +7,7 @@ Index: ruby-gnome2/extconf.rb
 ===================================================================
 --- ruby-gnome2.orig/extconf.rb
 +++ ruby-gnome2/extconf.rb
-@@ -58,6 +58,10 @@ if subdirs.size == 0
+@@ -62,6 +62,10 @@ if subdirs.size == 0
      subdir[0..$topsrcdir.size] = ""
      File.dirname(subdir)
    end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gnome2.git