[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@d53c493 [master] glib2 windows: update patch

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-10-16 09:10:46 +0900 (Mon, 16 Oct 2017)

  New Revision: d53c493302ec231aeee30296bc7fb4e4f557e9c5
  https://github.com/ruby-gnome2/ruby-gnome2/commit/d53c493302ec231aeee30296bc7fb4e4f557e9c5

  Message:
    glib2 windows: update patch

  Added files:
    glib2/patches/glib-2.54.1-add-missing-exeext.diff
  Removed files:
    glib2/patches/glib-2.48.0-add-missing-exeext.diff
  Modified files:
    glib2/Rakefile

  Modified: glib2/Rakefile (+1 -1)
===================================================================
--- glib2/Rakefile    2017-10-16 09:01:18 +0900 (6565f11b4)
+++ glib2/Rakefile    2017-10-16 09:10:46 +0900 (c7cf13a4d)
@@ -93,7 +93,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :windows => {
         :need_autoreconf => true,
         :patches => [
-          "glib-2.48.0-add-missing-exeext.diff",
+          "glib-2.54.1-add-missing-exeext.diff",
         ],
         :built_file => "bin/libglib-2.0-0.dll",
       },

  Deleted: glib2/patches/glib-2.48.0-add-missing-exeext.diff (+0 -36) 100644
===================================================================
--- glib2/patches/glib-2.48.0-add-missing-exeext.diff    2017-10-16 09:01:18 +0900 (cf0cc44f6)
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru glib-2.48.0.orig/gio/tests/Makefile.am glib-2.48.0/gio/tests/Makefile.am
---- glib-2.48.0.orig/gio/tests/Makefile.am	2016-03-23 00:15:18.000000000 +0900
-+++ glib-2.48.0/gio/tests/Makefile.am	2016-04-01 23:57:17.701727371 +0900
-@@ -532,7 +532,7 @@
- libresourceplugin_la_LDFLAGS += -rpath /
- endif
- 
--glib_compile_resources=$(top_builddir)/gio/glib-compile-resources
-+glib_compile_resources=$(top_builddir)/gio/glib-compile-resources$(EXEEXT)
- 
- resources.o: test_resources2.h
- test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test2.gresource.xml)
-diff -ru glib-2.48.0.orig/gobject/tests/Makefile.am glib-2.48.0/gobject/tests/Makefile.am
---- glib-2.48.0.orig/gobject/tests/Makefile.am	2016-02-29 23:32:08.000000000 +0900
-+++ glib-2.48.0/gobject/tests/Makefile.am	2016-04-02 00:03:17.344944211 +0900
-@@ -36,7 +36,7 @@
- # cross-compiling
- 
- if !CROSS_COMPILING
--glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
-+glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal$(EXEEXT)
- 
- test_programs += signals
- signals_SOURCES = signals.c
-diff -ru glib-2.48.0.orig/tests/gobject/Makefile.am glib-2.48.0/tests/gobject/Makefile.am
---- glib-2.48.0.orig/tests/gobject/Makefile.am	2016-02-24 07:25:37.000000000 +0900
-+++ glib-2.48.0/tests/gobject/Makefile.am	2016-04-02 00:00:07.259367148 +0900
-@@ -51,7 +51,7 @@
- # The marshal test requires running a binary, which means we cannot
- # build it when cross-compiling
- if !CROSS_COMPILING
--glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
-+glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal$(EXEEXT)
- 
- testmarshal.h: stamp-testmarshal.h
- 	@true

  Added: glib2/patches/glib-2.54.1-add-missing-exeext.diff (+12 -0) 100644
===================================================================
--- /dev/null
+++ glib2/patches/glib-2.54.1-add-missing-exeext.diff    2017-10-16 09:10:46 +0900 (397bd7a74)
@@ -0,0 +1,12 @@
+diff -ru glib-2.54.1.orig/gio/tests/Makefile.am glib-2.54.1/gio/tests/Makefile.am
+--- glib-2.54.1.orig/gio/tests/Makefile.am	2017-10-02 14:58:06.000000000 +0000
++++ glib-2.54.1/gio/tests/Makefile.am	2017-10-16 00:08:45.899226582 +0000
+@@ -543,7 +543,7 @@
+ libresourceplugin_la_LDFLAGS += -rpath /
+ endif
+ 
+-glib_compile_resources=$(top_builddir)/gio/glib-compile-resources
++glib_compile_resources=$(top_builddir)/gio/glib-compile-resources$(EXEEXT)
+ 
+ test-generated.txt: test1.txt
+ 	$(AM_V_GEN) echo "Generated" > $@ && \