new file mode 100644

@@ -0,0 +1,175 @@

+--- a/setup.py	2018-10-01 17:55:11.130750445 +0530

+@@ -45,6 +45,9 @@ GI_VERSION_REQUIRED = "1.46.0"

+ PYCAIRO_VERSION_REQUIRED = "1.11.1"

+ LIBFFI_VERSION_REQUIRED = "3.0"

+ 

++WITH_CAIRO = False

++"""Set to false if you don't want to build with cairo/pycairo support"""

++

+ 

+ def is_dev_version():

+     version = tuple(map(int, PYGOBJECT_VERISON.split(".")))

+@@ -455,7 +458,8 @@ class build_tests(Command):

+                 objects = compiler.compile(

+                     ext.sources,

+                     output_dir=self.build_temp,

+-                    include_dirs=ext.include_dirs)

++                    include_dirs=ext.include_dirs,

++                    macros=ext.define_macros)

+ 

+                 if os.name == "nt":

+                     postargs = ["-Wl,--out-implib=%s" %

+@@ -523,6 +527,10 @@ class build_tests(Command):

+                 "--output=%s" % typelib_path,

+             ])

+ 

++        regress_macros = []

++        if not WITH_CAIRO:

++            regress_macros.append(("_GI_DISABLE_CAIRO", "1"))

++

+         ext = Extension(

+             name='libregress',

+             sources=[

+@@ -536,21 +544,29 @@ class build_tests(Command):

+                 os.path.join(gi_tests_dir, "regress.h"),

+                 os.path.join(tests_dir, "regressextra.h"),

+             ],

++            define_macros=regress_macros,

+         )

+         add_ext_pkg_config_dep(ext, compiler.compiler_type, "glib-2.0")

+         add_ext_pkg_config_dep(ext, compiler.compiler_type, "gio-2.0")

+-        add_ext_pkg_config_dep(ext, compiler.compiler_type, "cairo")

+-        add_ext_pkg_config_dep(ext, compiler.compiler_type, "cairo-gobject")

++        if WITH_CAIRO:

++            add_ext_pkg_config_dep(ext, compiler.compiler_type, "cairo")

++            add_ext_pkg_config_dep(

++                ext, compiler.compiler_type, "cairo-gobject")

+         ext_paths = build_ext(ext)

+ 

+         gir_path = os.path.join(tests_dir, "Regress-1.0.gir")

+         typelib_path = os.path.join(tests_dir, "Regress-1.0.typelib")

+ 

++        if WITH_CAIRO:

++            gir_cairo_args = [

++                "--include=cairo-1.0", "--pkg=cairo", "--pkg=cairo-gobject"]

++        else:

++            gir_cairo_args = ["-D_GI_DISABLE_CAIRO"]

++

+         if self._newer_group(ext_paths, gir_path):

+             subprocess.check_call([

+                 g_ir_scanner,

+                 "--no-libtool",

+-                "--include=cairo-1.0",

+                 "--include=Gio-2.0",

+                 "--namespace=Regress",

+                 "--nsversion=1.0",

+@@ -560,10 +576,8 @@ class build_tests(Command):

+                 "--library=regress",

+                 "--pkg=glib-2.0",

+                 "--pkg=gio-2.0",

+-                "--pkg=cairo",

+-                "--pkg=cairo-gobject",

+                 "--output=%s" % gir_path,

+-            ] + ext.sources + ext.depends)

++            ] + gir_cairo_args + ext.sources + ext.depends)

+ 

+         if self._newer_group([gir_path], typelib_path):

+             subprocess.check_call([

+@@ -589,7 +603,6 @@ class build_tests(Command):

+         )

+         add_ext_pkg_config_dep(ext, compiler.compiler_type, "glib-2.0")

+         add_ext_pkg_config_dep(ext, compiler.compiler_type, "gio-2.0")

+-        add_ext_pkg_config_dep(ext, compiler.compiler_type, "cairo")

+         add_ext_compiler_flags(ext, compiler)

+ 

+         dist = Distribution({"ext_modules": [ext]})

+@@ -1009,15 +1022,16 @@ class build_ext(du_build_ext):

+         add_dependency(gi_ext, "libffi")

+         add_ext_compiler_flags(gi_ext, compiler)

+ 

+-        gi_cairo_ext = ext["gi._gi_cairo"]

+-        add_dependency(gi_cairo_ext, "glib-2.0")

+-        add_dependency(gi_cairo_ext, "gio-2.0")

+-        add_dependency(gi_cairo_ext, "gobject-introspection-1.0")

+-        add_dependency(gi_cairo_ext, "libffi")

+-        add_dependency(gi_cairo_ext, "cairo")

+-        add_dependency(gi_cairo_ext, "cairo-gobject")

+-        add_pycairo(gi_cairo_ext)

+-        add_ext_compiler_flags(gi_cairo_ext, compiler)

++        if WITH_CAIRO:

++            gi_cairo_ext = ext["gi._gi_cairo"]

++            add_dependency(gi_cairo_ext, "glib-2.0")

++            add_dependency(gi_cairo_ext, "gio-2.0")

++            add_dependency(gi_cairo_ext, "gobject-introspection-1.0")

++            add_dependency(gi_cairo_ext, "libffi")

++            add_dependency(gi_cairo_ext, "cairo")

++            add_dependency(gi_cairo_ext, "cairo-gobject")

++            add_pycairo(gi_cairo_ext)

++            add_ext_compiler_flags(gi_cairo_ext, compiler)

+ 

+     def run(self):

+         self._write_config_h()

+@@ -1119,6 +1133,9 @@ def main():

+     with io.open(readme, encoding="utf-8") as h:

+         long_description = h.read()

+ 

++    ext_modules = []

++    install_requires = []

++

+     gi_ext = Extension(

+         name='gi._gi',

+         sources=sources,

+@@ -1126,14 +1143,20 @@ def main():

+         depends=list_headers(script_dir) + list_headers(gi_dir),

+         define_macros=[("PY_SSIZE_T_CLEAN", None)],

+     )

++    ext_modules.append(gi_ext)

+ 

+-    gi_cairo_ext = Extension(

+-        name='gi._gi_cairo',

+-        sources=cairo_sources,

+-        include_dirs=[script_dir, gi_dir],

+-        depends=list_headers(script_dir) + list_headers(gi_dir),

+-        define_macros=[("PY_SSIZE_T_CLEAN", None)],

+-    )

++    if WITH_CAIRO:

++        gi_cairo_ext = Extension(

++            name='gi._gi_cairo',

++            sources=cairo_sources,

++            include_dirs=[script_dir, gi_dir],

++            depends=list_headers(script_dir) + list_headers(gi_dir),

++            define_macros=[("PY_SSIZE_T_CLEAN", None)],

++        )

++        ext_modules.append(gi_cairo_ext)

++        install_requires.append(

++            "pycairo>=%s" % get_version_requirement(

++                get_pycairo_pkg_config_name()))

+ 

+     version = pkginfo["Version"]

+     if is_dev_version():

+@@ -1160,10 +1183,8 @@ def main():

+             "gi.repository",

+             "gi.overrides",

+         ],

+-        ext_modules=[

+-            gi_ext,

+-            gi_cairo_ext,

+-        ],

++        ext_modules=ext_modules,

++        

+         cmdclass={

+             "build_ext": build_ext,

+             "distcheck": distcheck,

+@@ -1174,10 +1195,7 @@ def main():

+             "install": install,

+             "install_pkgconfig": install_pkgconfig,

+         },

+-        install_requires=[

+-            "pycairo>=%s" % get_version_requirement(

+-                get_pycairo_pkg_config_name()),

+-        ],

++        install_requires=install_requires,

+         data_files=[

+             ('include/pygobject-3.0', ['gi/pygobject.h']),

+         ],

@@ -1,24 +1,7 @@

-diff --git a/tests/runtests.py b/tests/runtests.py.1

-index 6085ff9..df69e68 100755

-+++ b/tests/runtests.py.1

-@@ -50,6 +50,10 @@ else:

-     names = []

-     for filename in glob.iglob(os.path.join(mydir, 'test_*.py')):

-         names.append(os.path.basename(filename)[:-3])

-+    names.remove('test_fields')

-+    names.remove('test_everything')

-+    names.remove('test_signal')

-+    names.remove('test_resulttuple')

- 

- loader = unittest.TestLoader()

- suite = loader.loadTestsFromNames(names)

-diff --git a/tests/test_error.py b/tests/test_error.py.1

-index 5702490..ce85f03 100644

-+++ b/tests/test_error.py.1

-@@ -25,6 +25,8 @@

- import unittest

+--- a/tests/test_error.py	2018-09-29 00:32:59.220553524 +0530

+@@ -28,6 +28,8 @@ import unittest

+ import pickle

  from gi.repository import GLib

 +import gi

@@ -26,23 +9,20 @@ index 5702490..ce85f03 100644

  from gi.repository import GIMarshallingTests

-diff --git a/tests/test_gi.py b/tests/test_gi.py.1

-index d0c72b6..7e2fc46 100644

-+++ b/tests/test_gi.py.1

-@@ -1475,6 +1475,7 @@ class TestPointer(unittest.TestCase):

+--- a/tests/test_gi.py	2018-09-29 00:34:17.392556911 +0530

+@@ -1783,7 +1783,7 @@ class TestPointer(unittest.TestCase):

+     def test_pointer_in_return(self):

          self.assertEqual(GIMarshallingTests.pointer_in_return(42), 42)

- 

+-

 +@unittest.skip("disabled photon build")

  class TestEnum(unittest.TestCase):

-     @classmethod

-diff --git a/tests/test_gtype.py b/tests/test_gtype.py.1

-index 8099101..0d7f33f 100644

-+++ b/tests/test_gtype.py.1

-@@ -1,6 +1,8 @@

+     def test_enum(self):

+--- a/tests/test_gtype.py	2018-09-29 00:34:59.732558746 +0530

+@@ -3,6 +3,8 @@ from __future__ import absolute_import

  import unittest

  from gi.repository import GObject

@@ -51,11 +31,9 @@ index 8099101..0d7f33f 100644

  from gi.repository import GIMarshallingTests

-diff --git a/tests/test_iochannel.py b/tests/test_iochannel.py.1

-index 5980a66..99333f6 100644

-+++ b/tests/test_iochannel.py.1

-@@ -51,6 +51,7 @@ second line

+--- a/tests/test_iochannel.py	2018-09-29 00:35:44.260560675 +0530

+@@ -55,6 +55,7 @@ second line

          self.assertEqual(ch.readline(), '')

          ch.shutdown(True)

@@ -63,12 +41,11 @@ index 5980a66..99333f6 100644

      def test_file_readline_latin1(self):

          ch = GLib.IOChannel(filename=self.testlatin1, mode='r')

          ch.set_encoding('latin1')

-@@ -113,6 +114,7 @@ second line

-         # invalid whence value

+@@ -118,6 +119,7 @@ second line

          self.assertRaises(ValueError, ch.seek, 0, 3)

+         ch.shutdown(True)

 +    @unittest.skip("disabled photon build")

      def test_file_write(self):

          ch = GLib.IOChannel(filename=self.testout, mode='w')

          ch.set_encoding('latin1')

-

@@ -2,24 +2,25 @@

 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

 Name:           pygobject

-Version:        3.24.1

-Release:        3%{?dist}

+Version:        3.30.1

+Release:        1%{?dist}

 Summary:        Python Bindings for GObject

 Group:          Development/Languages

 License:        LGPLv2+

 Vendor:         VMware, Inc.

 Distribution:   Photon

-URL:            ftp://ftp.gnome.org

-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.24/pygobject-3.24.1.tar.xz

+URL:            https://pypi.org/project/PyGObject

+Source0:        https://pypi.org/project/PyGObject/#files/PyGObject-%{version}.tar.gz

 Patch0:         pygobject-makecheck-fixes.patch

-%define sha1    pygobject=acdb1958e7f9785d92888a423afffd7164502f87

+Patch1:         build_without_cairo.patch

+%define sha1    PyGObject=d5a369f15dfd415dba7fad4c0f9811b56c597e10

 Requires:       python2

 Requires:       gobject-introspection

 Requires:       glib

+BuildRequires:  glib-devel

 BuildRequires:  python2-devel

 BuildRequires:  python2-libs

 BuildRequires:  gobject-introspection-devel

-BuildRequires:  glib-devel

 BuildRequires:  which

 %if %{with_check}

 BuildRequires:  gobject-introspection-python

@@ -54,38 +55,29 @@ Requires:       python3-pygobject = %{version}-%{release}

 Development files for pygobject.

 %prep

-%setup -q -n pygobject-%{version}

+%setup -q -n PyGObject-%{version}

 %patch0 -p1

+%patch1 -p1

 rm -rf ../p3dir

 cp -a . ../p3dir

 %build

-./configure \

-    --prefix=%{_prefix} \

-    --disable-cairo     \

-    --without-cairo     \

-    --with-python=/usr/bin/python2

-make

+python2 setup.py build

 pushd ../p3dir

-./configure \

-    --prefix=%{_prefix} \

-    --bindir=%{_bindir} \

-    --disable-cairo     \

-    --without-cairo     \

-    --with-python=/usr/bin/python3

-make

+python3 setup.py build

 popd

+

 %install

-make install DESTDIR=%{buildroot}

 pushd ../p3dir

-make install DESTDIR=%{buildroot}

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 popd

+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 %check

-make %{?_smp_mflags} check

+python2 setup.py test

 pushd ../p3dir

-make %{?_smp_mflags} check

+python3 setup.py test

 popd

 %clean

@@ -104,6 +96,8 @@ rm -rf %{buildroot}

 %{_includedir}/*

 %changelog

+*   Thu Sep 27 2018 Tapas Kundu <tkundu@vmware.com> 3.30.1-1

+-   Updated to release 3.30.1

 *   Tue Sep 19 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.24.1-3

 -   Skip some ui make check paths that failed.

 *   Thu Aug 10 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.24.1-2