[packages/ruby-gnome2] - don't try to install rpms at build time - fix missing require in build scripts - updated packages
baggins
baggins at pld-linux.org
Sat Nov 11 23:58:16 CET 2017
commit 38627fa5edcca85ac59fc79f6998dc5598f474e8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Nov 11 23:57:28 2017 +0100
- don't try to install rpms at build time
- fix missing require in build scripts
- updated packages and files
- rel 1
missing-gem-import.patch | 10 +
no-native-package-install.patch | 561 ++++++++++++++++++++++++++++++++++++++++
ruby-gnome2.spec | 174 +++----------
3 files changed, 612 insertions(+), 133 deletions(-)
---
diff --git a/ruby-gnome2.spec b/ruby-gnome2.spec
index 73d4777..bf9ec1e 100644
--- a/ruby-gnome2.spec
+++ b/ruby-gnome2.spec
@@ -1,9 +1,10 @@
+# TODO: update ri subpackage files
#
# Conditional build:
%bcond_without gtk3 # GTK+ 3.x based packages too
%bcond_without doc # don't build ri/rdoc
-%bcond_with gtksourceview3 # GKTSourceView 3.x binding
-%bcond_with vte3 # VTE 3.x binding
+%bcond_without gtksourceview3 # GKTSourceView 3.x binding
+%bcond_without vte3 # VTE 3.x binding
%if %{without gtk3}
%undefine with_vte3
@@ -12,15 +13,20 @@ Summary: GNOME 2 libraries for Ruby
Summary(pl.UTF-8): Biblioteki GNOME 2 dla języka Ruby
Name: ruby-gnome2
Version: 3.1.9
-Release: 0.1
+Release: 1
License: LGPL v2.1
Group: Development/Languages
Source0: http://downloads.sourceforge.net/ruby-gnome2/%{name}-all-%{version}.tar.gz
# Source0-md5: 670bfe3d7606ac39770c2e6123dbb0b6
+Patch0: no-native-package-install.patch
+Patch1: missing-gem-import.patch
URL: http://ruby-gnome2.sourceforge.jp/
BuildRequires: atk-devel >= 1:1.12.0
BuildRequires: cairo-devel >= 1.10.0
BuildRequires: cairo-gobject-devel >= 1.12.10
+BuildRequires: clutter-devel
+BuildRequires: clutter-gst-devel
+BuildRequires: clutter-gtk-devel
BuildRequires: gdk-pixbuf2-devel >= 2
BuildRequires: glib2-devel >= 1:2.16.0
BuildRequires: gobject-introspection-devel >= 1.35.4
@@ -28,6 +34,7 @@ BuildRequires: gstreamer-devel >= 0.10.35
BuildRequires: gtk+2-devel >= 2:2.12.0
%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.4.2}
BuildRequires: gtksourceview2-devel >= 2
+BuildRequires: libgsf-devel
BuildRequires: librsvg-devel >= 2.8
BuildRequires: pango-devel >= 1:1.14.0
BuildRequires: pkgconfig
@@ -127,6 +134,7 @@ Summary(pl.UTF-8): Ruby/ATK - wiązanie języka Ruby do biblioteki ATK
Group: Development/Languages
Requires: atk >= 1:1.12.0
Requires: ruby-glib2 = %{version}-%{release}
+Obsoletes: ruby-atk-devel
%description -n ruby-atk
Ruby/ATK is a Ruby binding of ATK.
@@ -134,20 +142,6 @@ Ruby/ATK is a Ruby binding of ATK.
%description -n ruby-atk -l pl.UTF-8
Ruby/ATK to wiązanie języka Ruby do biblioteki ATK.
-%package -n ruby-atk-devel
-Summary: Header files for Ruby/ATK library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Ruby/ATK
-Group: Development/Libraries
-Requires: atk-devel >= 1:1.12.0
-Requires: ruby-atk = %{version}-%{release}
-Requires: ruby-glib2-devel = %{version}-%{release}
-
-%description -n ruby-atk-devel
-Header files for Ruby/ATK library.
-
-%description -n ruby-atk-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki Ruby/ATK.
-
%package -n ruby-cairo-gobject
Summary: Ruby/CairoGObject - Ruby binding of cairo-gobject library
Summary(pl.UTF-8): Ruby/CairoGObject - wiązania języka Ruby do biblioteki cairo-gobject
@@ -198,6 +192,7 @@ Summary(pl.UTF-8): Ruby/GdkPixbuf2 - wiązanie języka Ruby do biblioteki GdkPix
Group: Development/Languages
Requires: gdk-pixbuf2 >= 2
Requires: ruby-glib2 = %{version}-%{release}
+Obsoletes: ruby-gdk_pixbuf2-devel
%description -n ruby-gdk_pixbuf2
Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf 2.x.
@@ -205,20 +200,6 @@ Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf 2.x.
%description -n ruby-gdk_pixbuf2 -l pl.UTF-8
Ruby/GdkPixbuf2 to wiązanie języka Ruby do biblioteki GdkPixbuf 2.x.
-%package -n ruby-gdk_pixbuf2-devel
-Summary: Header files for Ruby/GdkPixbuf2 library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Ruby/GdkPixbuf2
-Group: Development/Libraries
-Requires: gdk-pixbuf2-devel >= 2
-Requires: ruby-gdk_pixbuf2 = %{version}-%{release}
-Requires: ruby-glib2-devel = %{version}-%{release}
-
-%description -n ruby-gdk_pixbuf2-devel
-Header files for Ruby/GdkPixbuf2 library.
-
-%description -n ruby-gdk_pixbuf2-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki Ruby/GdkPixbuf2.
-
%package -n ruby-gtk2
Summary: Ruby/GTK2 - Ruby binding of GTK+ 2.x
Summary(pl.UTF-8): Ruby/GTK2 - wiązanie języka Ruby do biblioteki GTK+ 2.x
@@ -241,7 +222,6 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Ruby/GTK2
Group: Development/Libraries
Requires: gtk+2-devel >= 2:2.12.0
Requires: ruby-atk-devel = %{version}-%{release}
-Requires: ruby-gdk_pixbuf2-devel = %{version}-%{release}
Requires: ruby-glib2-devel = %{version}-%{release}
Requires: ruby-gtk2 = %{version}-%{release}
Requires: ruby-pango-devel = %{version}-%{release}
@@ -303,7 +283,6 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Ruby/GStreamer
Group: Development/Libraries
Requires: gstreamer-devel >= 0.10.35
Requires: gstreamer-plugins-base-devel >= 0.10.35
-Requires: ruby-gdk_pixbuf2-devel = %{version}-%{release}
Requires: ruby-glib2-devel = %{version}-%{release}
Requires: ruby-pango-devel = %{version}-%{release}
@@ -361,7 +340,6 @@ Summary: Header files for Ruby/Poppler library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Ruby/Poppler
Group: Development/Libraries
Requires: poppler-glib-devel >= 0.12.0
-Requires: ruby-gdk_pixbuf2-devel = %{version}-%{release}
Requires: ruby-glib2-devel = %{version}-%{release}
Requires: ruby-gtk2-devel = %{version}-%{release}
@@ -379,6 +357,7 @@ Requires: librsvg >= 2.8
Requires: ruby-gdk_pixbuf2 = %{version}-%{release}
Requires: ruby-glib2 = %{version}-%{release}
Requires: ruby-rcairo
+Obsoletes: ruby-rsvg2-devel
%description -n ruby-rsvg2
Ruby/RSVG is a Ruby binding of librsvg.
@@ -386,20 +365,6 @@ Ruby/RSVG is a Ruby binding of librsvg.
%description -n ruby-rsvg2 -l pl.UTF-8
Ruby/RSVG to wiązanie języka Ruby do biblioteki librsvg.
-%package -n ruby-rsvg2-devel
-Summary: Header files for Ruby/RSVG library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Ruby/RSVG
-Group: Development/Libraries
-Requires: librsvg-devel >= 2.8
-Requires: ruby-gdk_pixbuf2-devel = %{version}-%{release}
-Requires: ruby-glib2-devel = %{version}-%{release}
-
-%description -n ruby-rsvg2-devel
-Header files for Ruby/RSVG library.
-
-%description -n ruby-rsvg2-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki Ruby/RSVG.
-
%package -n ruby-vte
Summary: Ruby/VTE - Ruby binding of VTE
Summary(pl.UTF-8): Ruby/VTE - wiązanie języka Ruby do biblioteki VTE
@@ -467,7 +432,6 @@ Group: Development/Libraries
Requires: gtk+3-devel >= 3.4.2
Requires: ruby-atk-devel = %{version}-%{release}
Requires: ruby-devel >= 1.9.2
-Requires: ruby-gdk_pixbuf2-devel = %{version}-%{release}
Requires: ruby-glib2-devel = %{version}-%{release}
Requires: ruby-gtk3 = %{version}-%{release}
Requires: ruby-pango-devel = %{version}-%{release}
@@ -498,6 +462,7 @@ Summary(pl.UTF-8): Ruby/GtkSourceView3 - wiązanie języka Ruby do biblioteki gt
Group: Development/Languages
Requires: gtksourceview3 >= 3.4.2
Requires: ruby-gtk3 = %{version}-%{release}
+Obsoletes: ruby-gtksourceview3-devel
%description -n ruby-gtksourceview3
Ruby/GtkSourceView3 is a Ruby binding of gtksourceview 3.x.
@@ -506,26 +471,13 @@ Ruby/GtkSourceView3 is a Ruby binding of gtksourceview 3.x.
Ruby/GtkSourceView3 to wiązanie języka Ruby do biblioteki
gtksourceview 3.x.
-%package -n ruby-gtksourceview3-devel
-Summary: Header files for Ruby/GtkSourceView3 library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Ruby/GtkSourceView3
-Group: Development/Libraries
-Requires: gtksourceview3-devel >= 3.4.2
-Requires: ruby-gtk3-devel = %{version}-%{release}
-Requires: ruby-gtksourceview3 = %{version}-%{release}
-
-%description -n ruby-gtksourceview3-devel
-Header files for Ruby/GtkSourceView3 library.
-
-%description -n ruby-gtksourceview3-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki Ruby/GtkSourceView3.
-
%package -n ruby-vte3
Summary: Ruby/VTE3 - Ruby binding of VTE on GTK+ 3.x
Summary(pl.UTF-8): Ruby/VTE3 - wiązanie języka Ruby do biblioteki VTE na GTK+ 3.x
Group: Development/Languages
Requires: ruby-gtk3 = %{version}-%{release}
Requires: vte >= 0.32.2
+Obsoletes: ruby-vte3-devel
%description -n ruby-vte3
Ruby/VTE3 is a Ruby binding of VTE on GTK+ 3.x.
@@ -534,20 +486,6 @@ Ruby/VTE3 is a Ruby binding of VTE on GTK+ 3.x.
Ruby/VTE3 to wiązanie języka Ruby do biblioteki VTE opartej na GTK+
3.x.
-%package -n ruby-vte3-devel
-Summary: Header files for Ruby/VTE3 library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Ruby/VTE3
-Group: Development/Libraries
-Requires: ruby-gtk3-devel = %{version}-%{release}
-Requires: ruby-vte3 = %{version}-%{release}
-Requires: vte-devel >= 0.32.2
-
-%description -n ruby-vte3-devel
-Header files for Ruby/VTE3 library.
-
-%description -n ruby-vte3-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki Ruby/VTE3.
-
%package -n ruby-webkit-gtk
Summary: Ruby/WebKitGTK - Ruby binding of WebKitGTK+ (GTK+ 3.x based) library
Summary(pl.UTF-8): Ruby/WebKitGTK - wiązanie języka Ruby do biblioteki WebKitGTK+ (dla GTK+ 3.x)
@@ -600,6 +538,8 @@ Przykłady do Ruby-GNOME2.
%prep
%setup -q -n %{name}-all-%{version}
+%patch0 -p1
+%patch1 -p1
find . -name '*.rb' | xargs sed -i -e '1s,#.*local/bin/ruby,#!%{_bindir}/ruby,'
cp -p glib2/README.md README.glib2.md
@@ -668,12 +608,21 @@ install -d $RPM_BUILD_ROOT{%{ruby_archdir},%{ruby_rubylibdir}} \
RUBYARCHDIR=$RPM_BUILD_ROOT%{ruby_archdir}
# omitted by make install
+cp -p atk/lib/atk.rb $RPM_BUILD_ROOT%{ruby_rubylibdir}
cp -pr clutter/lib/{clutter,clutter.rb} $RPM_BUILD_ROOT%{ruby_rubylibdir}
cp -p clutter-gstreamer/lib/clutter-gst.rb $RPM_BUILD_ROOT%{ruby_rubylibdir}
cp -p webkit-gtk2/lib/webkit-gtk2.rb $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -pr gdk_pixbuf2/lib/{gdk_pixbuf2,gdk_pixbuf2.rb} $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -pr poppler/lib/{poppler,poppler.rb} $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -pr rsvg2/lib/{rsvg2,rsvg2.rb} $RPM_BUILD_ROOT%{ruby_rubylibdir}
%if %{with gtk3}
cp -p clutter-gtk/lib/clutter-gtk.rb $RPM_BUILD_ROOT%{ruby_rubylibdir}
cp -p webkit-gtk/lib/webkit-gtk.rb $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -pr gdk3/lib/{gdk3,gdk3.rb} $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -pr gtksourceview3/lib/{gtksourceview3,gtksourceview3.rb} $RPM_BUILD_ROOT%{ruby_rubylibdir}
+%if %{with vte3}
+cp -pr vte3/lib/{vte3,vte3.rb} $RPM_BUILD_ROOT%{ruby_rubylibdir}
+%endif
%endif
cp -a clutter/sample \
@@ -697,9 +646,6 @@ cp -a gtk2/sample \
cp -a gtksourceview2/sample \
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/gtksourceview2
-cp -a pango/sample \
- $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/pango
-
cp -a poppler/sample \
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/poppler
@@ -719,16 +665,6 @@ cp -a clutter-gtk/sample \
cp -a gtk3/sample \
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/gtk3
-%if %{with gtksourceview3}
-cp -a gtksourceview3/sample \
- $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/gtksourceview3
-%endif
-
-%if %{with vte3}
-cp -a vte3/sample \
- $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/vte3
-%endif
-
cp -a webkit-gtk/sample \
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/webkit-gtk
%endif
@@ -777,6 +713,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc gobject-introspection/README.md
%attr(755,root,root) %{ruby_archdir}/gobject_introspection.so
+%{ruby_rubylibdir}/gi.rb
%{ruby_rubylibdir}/gobject-introspection.rb
%{ruby_rubylibdir}/gobject-introspection
@@ -795,16 +732,9 @@ rm -rf $RPM_BUILD_ROOT
%files -n ruby-atk
%defattr(644,root,root,755)
-%doc atk/README
-%attr(755,root,root) %{ruby_archdir}/atk.so
+%doc atk/README.md
%{ruby_rubylibdir}/atk.rb
-%files -n ruby-atk-devel
-%defattr(644,root,root,755)
-%{ruby_archdir}/rbatk.h
-%{ruby_archdir}/rbatkversion.h
-%{_pkgconfigdir}/ruby-atk.pc
-
%files -n ruby-cairo-gobject
%defattr(644,root,root,755)
%doc cairo-gobject/README.md
@@ -813,28 +743,23 @@ rm -rf $RPM_BUILD_ROOT
%files -n ruby-pango
%defattr(644,root,root,755)
-%doc pango/README
+%doc pango/README.md
%attr(755,root,root) %{ruby_archdir}/pango.so
+%{ruby_rubylibdir}/pango
%{ruby_rubylibdir}/pango.rb
%files -n ruby-pango-devel
%defattr(644,root,root,755)
-%{ruby_archdir}/rbpango.h
-%{ruby_archdir}/rbpangoconversions.h
+%{ruby_archdir}/rb-pango-conversions.h
+%{ruby_archdir}/rb-pango.h
%{_pkgconfigdir}/ruby-pango.pc
%files -n ruby-gdk_pixbuf2
%defattr(644,root,root,755)
-%doc gdk_pixbuf2/README
-%attr(755,root,root) %{ruby_archdir}/gdk_pixbuf2.so
+%doc gdk_pixbuf2/README.md
+%{ruby_rubylibdir}/gdk_pixbuf2
%{ruby_rubylibdir}/gdk_pixbuf2.rb
-%files -n ruby-gdk_pixbuf2-devel
-%defattr(644,root,root,755)
-%{ruby_archdir}/rbgdk-pixbuf.h
-%{ruby_archdir}/rbgdk-pixbuf2conversions.h
-%{_pkgconfigdir}/ruby-gdk-pixbuf2.pc
-
%files -n ruby-gtk2
%defattr(644,root,root,755)
%doc gtk2/README
@@ -886,24 +811,16 @@ rm -rf $RPM_BUILD_ROOT
%files -n ruby-poppler
%defattr(644,root,root,755)
-%doc poppler/README
-%attr(755,root,root) %{ruby_archdir}/poppler.so
+%doc poppler/README.md
+%{ruby_rubylibdir}/poppler
%{ruby_rubylibdir}/poppler.rb
-%files -n ruby-poppler-devel
-%defattr(644,root,root,755)
-%{_pkgconfigdir}/ruby-poppler.pc
-
%files -n ruby-rsvg2
%defattr(644,root,root,755)
-%doc rsvg2/README
-%attr(755,root,root) %{ruby_archdir}/rsvg2.so
+%doc rsvg2/README.md
+%{ruby_rubylibdir}/rsvg2
%{ruby_rubylibdir}/rsvg2.rb
-%files -n ruby-rsvg2-devel
-%defattr(644,root,root,755)
-%{_pkgconfigdir}/ruby-rsvg2.pc
-
%files -n ruby-vte
%defattr(644,root,root,755)
%doc vte/README
@@ -925,8 +842,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README.gdk3.md README.gtk3.md
%attr(755,root,root) %{ruby_archdir}/gtk3.so
-%{ruby_rubylibdir}/gtk3.rb
+%{ruby_rubylibdir}/gdk3
+%{ruby_rubylibdir}/gdk3.rb
%{ruby_rubylibdir}/gtk3
+%{ruby_rubylibdir}/gtk3.rb
%files -n ruby-gtk3-devel
%defattr(644,root,root,755)
@@ -941,26 +860,16 @@ rm -rf $RPM_BUILD_ROOT
%files -n ruby-gtksourceview3
%defattr(644,root,root,755)
%doc gtksourceview3/README.md
-%attr(755,root,root) %{ruby_archdir}/gtksourceview3.so
%{ruby_rubylibdir}/gtksourceview3.rb
%{ruby_rubylibdir}/gtksourceview3
-
-%files -n ruby-gtksourceview3-devel
-%defattr(644,root,root,755)
-%{_pkgconfigdir}/ruby-gtksourceview3.pc
%endif
%if %{with vte3}
%files -n ruby-vte3
%defattr(644,root,root,755)
%doc vte3/README.md
-%attr(755,root,root) %{ruby_archdir}/vte3.so
%{ruby_rubylibdir}/vte3.rb
%{ruby_rubylibdir}/vte3
-
-%files -n ruby-vte3-devel
-%defattr(644,root,root,755)
-%{_pkgconfigdir}/ruby-vte3.pc
%endif
%files -n ruby-webkit-gtk
@@ -1010,7 +919,6 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_ridir}/Pango
%{ruby_ridir}/Pong
%{ruby_ridir}/Poppler
-%{ruby_ridir}/RSVG
%{ruby_ridir}/SrcWindow
%{ruby_ridir}/StatusIconSample
%{ruby_ridir}/VideoApp
diff --git a/missing-gem-import.patch b/missing-gem-import.patch
new file mode 100644
index 0000000..80d79ab
--- /dev/null
+++ b/missing-gem-import.patch
@@ -0,0 +1,10 @@
+--- ruby-gnome2-all-3.1.9/glib2/lib/mkmf-gnome2.rb~ 2017-11-11 21:02:01.000000000 +0100
++++ ruby-gnome2-all-3.1.9/glib2/lib/mkmf-gnome2.rb 2017-11-11 21:09:44.142428283 +0100
+@@ -13,6 +13,7 @@
+ require 'mkmf'
+ require 'pkg-config'
+ require 'glib-mkenums'
++require 'rubygems'
+
+ $CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
+
diff --git a/no-native-package-install.patch b/no-native-package-install.patch
new file mode 100644
index 0000000..f3cfdda
--- /dev/null
+++ b/no-native-package-install.patch
@@ -0,0 +1,561 @@
+diff -ur ruby-gnome2-all-3.1.9/atk/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/atk/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/atk/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/atk/dependency-check/Rakefile 2017-11-11 20:51:12.317214391 +0100
+@@ -15,30 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("atk")
+- unless NativePackageInstaller.install(:altlinux => "libatk-devel",
+- :debian => "libatk1.0-dev",
+- :redhat => "atk-devel",
+- :arch => "atk",
+- :homebrew => "atk",
+- :macports => "atk",
+- :msys2 => "atk")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/clutter/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/clutter/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/clutter/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/clutter/dependency-check/Rakefile 2017-11-11 20:51:47.780886888 +0100
+@@ -15,26 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("clutter-1.0")
+- unless NativePackageInstaller.install(:debian => "libclutter-1.0-dev",
+- :homebrew => "clutter",
+- :msys2 => "clutter")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/clutter-gstreamer/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/clutter-gstreamer/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/clutter-gstreamer/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/clutter-gstreamer/dependency-check/Rakefile 2017-11-11 20:52:24.494453464 +0100
+@@ -15,26 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("clutter-gst-3.0")
+- unless NativePackageInstaller.install(:debian => "libclutter-gst-3.0-dev",
+- :homebrew => "clutter-gst",
+- :msys2 => "clutter-gst")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/clutter-gtk/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/clutter-gtk/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/clutter-gtk/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/clutter-gtk/dependency-check/Rakefile 2017-11-11 20:52:55.645156402 +0100
+@@ -15,26 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("clutter-gtk-1.0")
+- unless NativePackageInstaller.install(:debian => "libclutter-gtk-1.0-dev",
+- :homebrew => "clutter-gtk",
+- :msys2 => "clutter-gtk")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/gdk3/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/gdk3/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/gdk3/dependency-check/Rakefile 2017-07-15 05:39:46.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/gdk3/dependency-check/Rakefile 2017-11-11 20:53:26.112583699 +0100
+@@ -15,29 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("gdk-3.0")
+- unless NativePackageInstaller.install(:altlinux => "libgtk+3-devel",
+- :debian => "libgtk-3-dev",
+- :redhat => "gtk3-devel",
+- :homebrew => "gtk+3",
+- :macports => "gtk3",
+- :msys2 => "gtk3")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/gdk_pixbuf2/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/gdk_pixbuf2/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/gdk_pixbuf2/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/gdk_pixbuf2/dependency-check/Rakefile 2017-11-11 20:54:15.561741491 +0100
+@@ -15,31 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("gdk-pixbuf-2.0")
+- unless NativePackageInstaller.install(:altlinux => "gdk-pixbuf-devel",
+- :debian => "libgdk-pixbuf2.0-dev",
+- :redhat => "gtk2-devel",
+- :fedora => "gdk-pixbuf2-devel",
+- :arch => "gdk-pixbuf2",
+- :homebrew => "gdk-pixbuf",
+- :macports => "gdk-pixbuf2",
+- :msys2 => "gdk-pixbuf2")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/glib2/lib/mkmf-gnome2.rb ruby-gnome2-all-3.1.9-no-native/glib2/lib/mkmf-gnome2.rb
+--- ruby-gnome2-all-3.1.9/glib2/lib/mkmf-gnome2.rb 2017-11-11 21:00:39.250594541 +0100
++++ ruby-gnome2-all-3.1.9-no-native/glib2/lib/mkmf-gnome2.rb 2017-11-11 20:56:16.744017411 +0100
+@@ -13,7 +13,6 @@
+ require 'mkmf'
+ require 'pkg-config'
+ require 'glib-mkenums'
+-require "native-package-installer"
+
+ $CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
+
+@@ -147,18 +146,8 @@
+ end
+ end
+
+-def setup_homebrew_libffi
+- platform = NativePackageInstaller::Platform.detect
+- return unless platform.is_a?(NativePackageInstaller::Platform::Homebrew)
+-
+- libffi_prefix = `brew --prefix libffi`.chomp
+- PKGConfig.add_path("#{libffi_prefix}/lib/pkgconfig")
+-end
+-
+ #add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
+ def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
+- setup_homebrew_libffi if target_name == "gobject-introspection"
+-
+ gem_spec = find_gem_spec(target_name)
+ if gem_spec
+ target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
+@@ -472,24 +461,14 @@
+ PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
+ end
+
+-def install_missing_native_package(native_package_info)
+- NativePackageInstaller.install(native_package_info)
+-end
+-
+ def required_pkg_config_package(package_info, native_package_info=nil)
+ if package_info.is_a?(Array)
+ required_package_info = package_info
+ else
+ required_package_info = [package_info]
+ end
+- if required_package_info.include?("gobject-introspection-1.0")
+- setup_homebrew_libffi
+- end
+ return true if PKGConfig.have_package(*required_package_info)
+
+- native_package_info ||= {}
+- return false unless install_missing_native_package(native_package_info)
+-
+ PKGConfig.have_package(*required_package_info)
+ end
+
+diff -ur ruby-gnome2-all-3.1.9/glib2/Rakefile ruby-gnome2-all-3.1.9-no-native/glib2/Rakefile
+--- ruby-gnome2-all-3.1.9/glib2/Rakefile 2017-10-16 02:10:30.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/glib2/Rakefile 2017-11-11 20:56:34.721561590 +0100
+@@ -38,7 +38,6 @@
+ package.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
+ package.dependency.gem.runtime = [
+ ["pkg-config", ">= 1.2.2"],
+- ["native-package-installer", ">= 1.0.3"],
+ ]
+ package.dependency.gem.development = [["test-unit", ">= 2"]]
+ package.windows.packages = []
+diff -ur ruby-gnome2-all-3.1.9/gnumeric/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/gnumeric/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/gnumeric/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/gnumeric/dependency-check/Rakefile 2017-11-11 20:56:58.862297606 +0100
+@@ -15,22 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless NativePackageInstaller.install(:debian => "gir1.2-gnumeric")
+- exit(false)
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/goffice/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/goffice/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/goffice/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/goffice/dependency-check/Rakefile 2017-11-11 20:57:18.960070919 +0100
+@@ -31,37 +31,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("libgoffice-0.10")
+- goffice010_spec = {
+- :debian => "libgoffice-0.10-dev",
+- :homebrew => "goffice",
+- }
+- unless NativePackageInstaller.install(goffice010_spec)
+- unless PKGConfig.check_version?("libgoffice-0.8")
+- goffice08_spec = {
+- :debian => "libgoffice-0.8-dev",
+- :redhat => "goffice08-devel",
+- :homebrew => "goffice",
+- }
+- unless NativePackageInstaller.install(goffice08_spec)
+- exit(false)
+- end
+- end
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/gsf/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/gsf/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/gsf/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/gsf/dependency-check/Rakefile 2017-11-11 20:57:35.596221440 +0100
+@@ -15,26 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("libgsf-1")
+- unless NativePackageInstaller.install(:debian => "libgsf-1-dev",
+- :homebrew => "libgsf",
+- :msys2 => "libgsf")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/gtksourceview3/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/gtksourceview3/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/gtksourceview3/dependency-check/Rakefile 2017-07-15 05:39:46.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/gtksourceview3/dependency-check/Rakefile 2017-11-11 20:58:27.945184500 +0100
+@@ -15,29 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("gtksourceview-3.0")
+- unless NativePackageInstaller.install(:altlinux => "libgtksourceview3-devel",
+- :debian => "libgtksourceview-3.0-dev",
+- :redhat => "gtksourceview3-devel",
+- :homebrew => "gtksourceview3",
+- :macports => "gtksourceview3",
+- :msys2 => "gtksourceview3")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/poppler/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/poppler/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/poppler/dependency-check/Rakefile 2017-10-15 15:51:26.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/poppler/dependency-check/Rakefile 2017-11-11 20:58:49.923301917 +0100
+@@ -15,30 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("poppler", 0, 12, 0)
+- unless NativePackageInstaller.install(:alt_linux => "libpoppler-glib-devel",
+- :debian => "libpoppler-glib-dev",
+- :redhat => "poppler-glib-devel",
+- :arch_linux => "poppler",
+- :homebrew => "poppler",
+- :macports => "poppler",
+- :msys2 => "poppler")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/rsvg2/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/rsvg2/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/rsvg2/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/rsvg2/dependency-check/Rakefile 2017-11-11 20:59:23.918285867 +0100
+@@ -15,30 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("librsvg-2.0")
+- unless NativePackageInstaller.install(:altlinux => "librsvg-devel",
+- :debian => "librsvg2-dev",
+- :redhat => "librsvg2-devel",
+- :arch => "librsvg",
+- :homebrew => "librsvg",
+- :macports => "librsvg",
+- :msys2 => "librsvg")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/vte3/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/vte3/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/vte3/dependency-check/Rakefile 2017-04-25 15:01:26.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/vte3/dependency-check/Rakefile 2017-11-11 20:59:54.182701045 +0100
+@@ -15,28 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-case RUBY_PLATFORM
+-when /mingw|mswin/
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("vte-2.91")
+- unless NativePackageInstaller.install(:altlinux => "libvte3-devel",
+- :debian => "libvte-2.91-dev",
+- :redhat => "vte3-devel",
+- :homebrew => "vte3")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/webkit2-gtk/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/webkit2-gtk/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/webkit2-gtk/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/webkit2-gtk/dependency-check/Rakefile 2017-11-11 21:00:10.379849328 +0100
+@@ -15,25 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("webkit2gtk-4.0")
+- unless NativePackageInstaller.install(:debian => "libwebkit2gtk-4.0-dev",
+- :homebrew => "webkitgtk")
+- exit(false)
+- end
+- end
+- end
+-end
+diff -ur ruby-gnome2-all-3.1.9/webkit-gtk/dependency-check/Rakefile ruby-gnome2-all-3.1.9-no-native/webkit-gtk/dependency-check/Rakefile
+--- ruby-gnome2-all-3.1.9/webkit-gtk/dependency-check/Rakefile 2017-05-29 14:57:02.000000000 +0200
++++ ruby-gnome2-all-3.1.9-no-native/webkit-gtk/dependency-check/Rakefile 2017-11-11 21:00:25.083577525 +0100
+@@ -15,25 +15,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ require "pkg-config"
+-require "native-package-installer"
+
+-if File.exist?(File.join(__dir__, "..", "vendor"))
+- task :default => "nothing"
+-else
+- task :default => "dependency:check"
+-end
++task :default => "nothing"
+
+ task :nothing do
+ end
+-
+-namespace :dependency do
+- desc "Check dependency"
+- task :check do
+- unless PKGConfig.check_version?("webkitgtk-3.0")
+- unless NativePackageInstaller.install(:debian => "libwebkitgtk-3.0-dev",
+- :msys2 => "webkitgtk3")
+- exit(false)
+- end
+- end
+- end
+-end
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-gnome2.git/commitdiff/38627fa5edcca85ac59fc79f6998dc5598f474e8
More information about the pld-cvs-commit
mailing list